Re: [RFC/PATCH] merge: Add '--continue' option as a synonym for 'git commit'
From: Chris Packham <hidden>
Date: 2016-12-13 08:33:29
On Mon, Dec 12, 2016 at 10:02 PM, Markus Hitter [off-list ref] wrote:
Am 12.12.2016 um 09:34 schrieb Chris Packham:quoted
Teach 'git merge' the --continue option which allows 'continuing' a merge by completing it. The traditional way of completing a merge after resolving conflicts is to use 'git commit'. Now with commands like 'git rebase' and 'git cherry-pick' having a '--continue' option adding such an option to 'git merge' presents a consistent UI.Like. While Junio is entirely right that this is redundant, the inner workings of Git are just voodoo for a (guessed) 95% of users out there, so a consistent UI is important.quoted
DESCRIPTION -----------@@ -61,6 +62,9 @@ reconstruct the original (pre-merge) changes. Therefore: discouraged: while possible, it may leave you in a state that is hard to back out of in the case of a conflict. +The fourth syntax ("`git merge --continue`") can only be run after the +merge has resulted in conflicts. 'git merge --continue' will take the +currently staged changes and complete the merge.I think this should mention the equivalence to 'git commit'.
It is mentioned in the OPTIONS section where the --continue option is documented. I could move it here but the OPTIONS section is where the --abort synonym also has a reference to git reset --merge.
Markus -- - - - - - - - - - - - - - - - - - - - Dipl. Ing. (FH) Markus Hitter http://www.jump-ing.de/