cherry-pick: added extra info on conflict next steps (also applies to rebase)

twosigma / git-meta

Repository for the git-meta project -- build your own monorepo using Git submodules

http://twosigma.github.io/git-meta

BSD 3-Clause "New" or "Revised" License

216 stars 50 forks source link

cherry-pick: added extra info on conflict next steps (also applies to rebase) #868

Closed Dsl03 closed 1 year ago

Dsl03 commented 1 year ago

Implemented change that displayed extra information on next steps to take when facing a conflict when utilizing cherry-pick/rebase git meta cherry-pick --continue or git meta cherry-pick --abort