3 Comments
User's avatar
Vidur Punj's avatar

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

Expand full comment
Ugo's avatar

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

Expand full comment
Dany Avila's avatar

Very useful information!! thank you

Expand full comment