Git : Steps to take after getting a sign off in code review branch

Steps to take after getting a sign off in code review branch.  feature/masquerading (say)

— Go back to master

  • [feature/masquerading]> git checkout master

— get latest code from master

  • [master]> git pull origin master
  • [master]> git checkout feature/masquerading

— rebase with master

  • [feature/masquerading]> git rebase master
  • [feature/masquerading]> git add readconfigapp2/Program.cs
  • [feature/masquerading]> git rebase –continue
  • [feature/masquerading]> git checkout master

— merge and push master

  • [master]> git merge feature/masquerading
  • [master]> git push origin master

— delete CR branch

  • [master]> git branch -d feature/masquerading
  • [master]> git push origin –delete feature/masquerading
Advertisements

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out / Change )

Twitter picture

You are commenting using your Twitter account. Log Out / Change )

Facebook photo

You are commenting using your Facebook account. Log Out / Change )

Google+ photo

You are commenting using your Google+ account. Log Out / Change )

Connecting to %s