How to use git rebase instead merge

We want to rebase changes from master branch to our feature branch. To do so, first of all, you need to checkout master branch and pull latest changes:

git checkout master
git pull origin master

Then checkout to your feature branch and rebase develop to it:

git checkout feature-branch
git rebase master
git push -f origin feature-branch

Checkout this great tutorial: Rebase vs Merge

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