> Could you provide some sample output? Yes, I know I can do it
> myself, but I am lazy. :)
<quote>
e...@pool:work$ git merge origin/topic-branch-blah
Renaming stuff/parts/foobar.txt => stuff/parts/burble.txt
Auto-merging stuff/parts/burble.txt
CONFLICT (rename/modify): Merge conflict in stuff/parts/burble.txt
CONFLICT (delete/modify): stuff/parts/frobnotz.txt deleted in HEAD and modified
in origin/topic-branch-blah. Version origin/topic-branch-blah of
stuff/parts/frobnotz.txt left in tree.
Recorded preimage for 'stuff/parts/burble.txt'
Automatic merge failed; fix conflicts and then commit the result.
e...@pool:work$ emacs stuff/parts/burble.txt
e...@pool:work$ git add stuff/parts/burble.txt
e...@pool:work$ git rm stuff/parts/frobnotz.txt
stuff/parts/frobnotz.txt: needs merge
rm 'stuff/parts/frobnotz.txt'
</quote> (Based on an archived emacs M-x shell session from a real
merge, but with large amounts of extraneous material deleted and the
survivors renamed mercilessly. Obviously, I didn't actually invoke
emacs from that command-line ...)
Notice that I'm told frobnotz.txt needs merge by the very command in
which I resolve its conflicts. Notice that the comparatively complex
situation with burble.txt (where my work branch has renamed foobar.txt
to it but the topic branch hadn't) is handled more gracefully.
Eddy.
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
