Rebase remote branch onto master while keeping the remote branch updated

git rebase git-remote
Andrew picture Andrew · Oct 7, 2016 · Viewed 20.2k times · Source

I am trying to rebase my remote branch onto master, but I want to keep the remote branch pointing to it's commits, just based at a different point in master.

Here is my structure:

A - B - C - D  (origin/master)
 \
  R - S - T (origin/develop)

I would like:

A  - B - C - D (origin/master) - R - S - T (origin/develop)

Is such a rebase possible without some sort of merge?

Answer

Lucas Batista Gabriel picture Lucas Batista Gabriel · Oct 7, 2016

to see more about rebase you can check this link or write git rebase --help at your terminal

To solve your problem there is a easy way, follow this steps:

git branch -D develop //this will remove your local develop repository
git fetch //update references 
git checkout develop //change to develop branch, but because you deleted, this command will also download the origin/develop
git rebase -p origin/master

at this step you can have some conflicts, so resolve them and git add FILES THAT HAD CONFLICTS and git rebase --continue

Now check if everything still working after rebase, if yes

git push -f origin develop

Related questions

Squash my last X commits together using Git

How can I squash my last X commits together into one commit using Git?

Read More
Git refusing to merge unrelated histories on rebase

During git rebase origin/development the following error message is shown from Git: fatal: refusing to merge unrelated histories Error redoing merge 1234deadbeef1234deadbeef My Git version is 2.9.0. It used to work fine in the previous version. How can I …

Read More
Undoing a git rebase

Does anybody know how to easily undo a git rebase? The only way that comes to mind is to go at it manually: git checkout the commit parent to both of the branches then create a temp branch from there …

Read More