Rebasing two branches Git

Rebasing is necessary in Git if your team is working on multiple branches. To merge code from remote branch to your working branch these commands are necessary:

First checkout to your remote branch and fetch all files

$ git checkout -b remote-branch

$ git fetch

Then give rebase from your working branch

$ git checkout working-branch

$ git rebase -i remote-branch

Then see the conflicts using

$ git status

Resolve all the conflicts then do

$ git add .

$ git rebase --continue

 

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 )

Google photo

You are commenting using your Google 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 )

Connecting to %s