Any interest in 'git merge --continue' as a command
- From
Chris Packham <judge.packham@gmail.com>
- Date
- Dec 9, 2016, 07:57 UTC
- Message-ID
- <CAFOYHZDs5rBt5+4D_ViMYfV04foq3h_UrsSMA3FfyMzLh9QdwA@mail.gmail.com>
I hit this at $dayjob recently.
A developer had got themselves into a confused state when needing to resolve a merge conflict.
They knew about git rebase --continue (and git am and git cherry-pick) but they were unsure how to "continue" a merge (it didn't help that the advice saying to use 'git commit' was scrolling off the top of the terminal). I know that using 'git commit' has been the standard way to complete a merge but given other commands have a --continue should merge have it as well?