A really stupid question

git-annex/ forum/ A really stupid question

Edit
RecentChanges
History
Preferences
Branchable
1 comment

install
assistant
walkthrough
tips
bugs
todo
forum
comments
contact
thanks

Sorry, but all this wiki and the manpage seem to gloss over the most obvious question:

What happens when you commit conflicting edits in different repositories?

RSS Atom

You get a regular git merge conflict, which can be resolved in any of the regular ways, except that conflicting files are just symlinks.

Example:

$ git pull
...
Auto-merging myfile
CONFLICT (add/add): Merge conflict in myfile
Automatic merge failed; fix conflicts and then commit the result.
$ git status
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 1 and 1 different commit(s) each, respectively.
#
# Unmerged paths:
#   (use "git add/rm ..." as appropriate to mark resolution)
#
#   both added:         myfile
#
no changes added to commit (use "git add" and/or "git commit -a")
$ git add myfile
$ git commit -m "took local version of the conflicting file"

Comment by joey — Tue Dec 20 23:07:25 2011

Remove comment

Links: What can be done in case of conflict/comment 1 5ca86b099dfa08a50f656ea03bf1dcd9

Last edited Wed Nov 27 22:47:37 2013