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

Elaborated on Cherry-Pick and Rebase Error Messages + Updated Tests for Cherry-Pick and Rebase #869

Closed Dsl03 closed 1 year ago

Dsl03 commented 1 year ago

I elaborated on cherry-pick and rebase error messages to include next steps when running into a conflict e.g. git meta cherry-pick --abort or git meta cherry-pick --continue. After this, I also updated particular tests relating to cherry-pick and rebase to reflect these changes.