Out of Sync Commits

Sometimes, when doing a post-review, other people’s commits show up in your diff, this is due to out-of-sync branches.

This is a common issue but the fix is fairly simple.

From the terminal inside your review board root directory, type the following commands:

$ git checkout master
$ git fetch origin
$ git fetch origin master
$ git pull origin master
$ git checkout "feature branch"
$ git merge master
$ post-review -r "review id"

 
Where “feature branch” is the name of your out-of-sync branch, and “review id” is the id of your posted review.

That’s it, your branches should now be in-sync.

Yazan Medanat

Advertisements

One thought on “Out of Sync Commits

  1. Pingback: Status Reports for March 31st, 2012 « Review Board Student Blog

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