i'm little confused stuff i'm reading online, perhaps can clearer answer explaining i'd do.
here's have: - commit has api updates , other people need. - commit still in review, hasn't been merged master branch. cannot git fetch/merge/pull updates yet.
what want code, though it's still in review, , continue our work that's dependent on it. tried cherry-picking, , working need to. there's no problem until decide i'm ready commit , push code review.
i see 2 options: 1: not commit code yet, let sit in stash. wait until commit merged. have somehow undo cherry-pick since cherry-picking creates new commit. git fetch/merge/pull, unstash code, commit changes, , submit code.
2: there way submit code , have dependent on commit getting merged? can't push code cherry-pick, error saying cherry-picked code hasn't been changed.
- how either of above?
- is 1 option more advisable other?
- is there different method above should instead? if so, what?
if remember correctly (it's been year), believe if (1) (cherry pick, stash it, , wait until review goes through), if pull merged code, pop stash, rebase (assuming have 2 different branches) on top of new merged code, should keep changes have made, can commit.
you have careful not lose cherry-picked code (make sure stash it, because otherwise if change branches might lose code).
the issue might if changed during code review , have old version of "commit a." when try put changes on top of (the new merged code) might have merge-conflicts (depending on how rebase). recommend getting gitextensions visually see how code branches when things stashing pulling.
i recommend testing method suggested above on separate branch, , understand how works first before trying on actual code developing.
Comments
Post a Comment