Re: [PATCH 0/7] New sequencer workflow!
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Nov 13, 2011, 20:56 UTC
- Message-ID
- <7v39droi63.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <1321181181-23923-1-git-send-email-artagnon@gmail.com>
Ramkumar Ramachandra <artagnon@gmail.com> writes:
Show 14 quoted lines
> This series preserves the old workflow: > > $ git cherry-pick foo > ... conflict ... > $ echo "resolved" >problematicfile > $ git add problematicfile > $ git commit > > $ git cherry-pick foo..bar > ... conflict ... > $ echo "resolved" >problematicfile > $ git add problematicfile > $ git commit > $ git revert --continue # No, there are no typos
Hmm, doesn't "git add && git cherry-pick --continue" (i.e. no "git commit" in between) trigger the "commit the resolution first and then go on"?
Show 19 quoted lines
> And introduces a brand new workflow: > > $ git cherry-pick foo > ... conflict ... > $ echo "resolved" >problematicfile > $ git add problematicfile > $ git sequencer --continue > > $ git cherry-pick foo..bar > ... conflict ... > $ echo "resolved" >problematicfile > $ git add problematicfile > $ git sequencer --continue > > $ git revert moo..baz > ... conflict ... > $ echo "resolved" >problematicfile > $ git add problematicfile > $ git sequencer --continue
Almost. If these are replaced with "git cherry-pick --continue" and "git revert --continue" that internally triggers "git sequencer --continue" *and* errors out if a wrong command was used to "--continue", it would be perfect.
The longer-term ultimate goal would be to make it "git continue" that covers more than the sequencer based workflow, i.e. allow "git merge" that conflicted to be concluded with "edit && git add && git continue".