git - Commit to gerrit approach -
what best approach of merging commits 1 gerrit? problem follows:
small stories need have max 2 commits. far review failed 2 times, , now, third time need commit , need have max 2 patchsets not 3.
the way following:
if first time, commit + review. simple that.
second, third,etc commit, create review branch , squash.
should see that:
$ git rebase -i head~4 pick 01d1125 smth s 6340aah smth 2 s ebfd369 smth 3 s 30e0ccb fixed review. # rebase 60709da..30e0ccb onto 60709da # # commands: # p, pick = use commit # e, edit = use commit, stop amending # s, squash = use commit, meld previous commit # # if remove line here commit lost. # however, if remove everything, rebase aborted. #
Comments
Post a Comment