Wednesday, December 23, 2015

Git-Gerrit Made Easy - Part 1

First Procedure:
1.   At First, commit your change to local branch.
2.   ($ git log --oneline --decorate --graph). Then grab the commit id.
3.   fetch my origin ($ git fetch origin)
4.   and then rebase master. ($ git rebase origin/master)
5.   Then I have to give the push command.( $ git push origin HEAD:refs/for/develop).

Second Procedure:
l  At First, commit your change to local branch.
l  ($ git log --oneline --decorate --graph). Then grab the commit id.
l  fetch my origin ($ git fetch origin)
l  and then rebase master. ($ git rebase origin/master)
l  If any kind of problem occurs in rebasing position. I have to create a new branch from origin/master. Then cherry-pick the previous commit id. Then push it.
l  Create a new branch (git checkout -b bug#75#L origin/master)
l  Then cherry-pick the commit id(git cherry-pick b6e82b5)
l  Then I have to give the push command.( $ git push origin HEAD:refs/for/develop).


No comments:

Post a Comment