... | ... | @@ -110,7 +110,8 @@ error: could not apply 801dfe8f5d... Add CHANGES entry |
|
|
hint: after resolving the conflicts, mark the corrected paths
|
|
|
hint: with 'git add <paths>' or 'git rm <paths>'
|
|
|
hint: and commit the result with 'git commit'
|
|
|
Replay failed. Cherry-picking needs to be completed manually.
|
|
|
|
|
|
Replay interrupted. Conflicts need to be fixed manually.
|
|
|
When done, run "git replay-merge --continue".
|
|
|
Use "git replay-merge --abort" to abort the replay.
|
|
|
```
|
... | ... | @@ -141,16 +142,10 @@ cherry-picking can continue: |
|
|
```sh
|
|
|
$ $VISUAL CHANGES
|
|
|
$ git add CHANGES
|
|
|
$ git cherry-pick --continue
|
|
|
$ git replay-merge --continue
|
|
|
[fix-loadpending-handling-v9_12 b7a6e602e9] Add CHANGES entry
|
|
|
Date: Thu Feb 15 20:31:55 2018 +0100
|
|
|
1 file changed, 6 insertions(+)
|
|
|
```
|
|
|
|
|
|
With cherry-picking finished, it is time to poke `git replay-merge` to resume its work:
|
|
|
|
|
|
```sh
|
|
|
$ git replay-merge --continue
|
|
|
Attempting to merge fix-loadpending-handling-v9_12 into v9_12...
|
|
|
Switched to a new branch 'v9_12'
|
|
|
Merge made by the 'recursive' strategy.
|
... | ... | |