3 Comments

No need to commit on do git cherry-pick --continue after git add command and resolving the conflict.

Expand full comment

Sorry, but did you have to commit after adding the file with conflict?

Expand full comment

Very useful information!! thank you

Expand full comment