How to do a re-merge into another branch in git

0 votes

I am working on a demo branch in git but whenever I try to merge it with the master its says it's already up to date. Then if I do a git diff it shows that a lot of files are different.

I want to re-merge master into demo, while keeping the changes which I've made in the demo branch, merging the files that I've changed in master.

May 7, 2018 in Git & GitHub by Atul
• 10,240 points
581 views

1 answer to this question.

0 votes

Seems like you want to rebase your demo branch from the master branch.

use this command to rebase:

git rebase origin/master 

This is what rebasing does.

Rebasing will keep the changes made in your demo branch while adding all the changes you've made to the master ever since you branched out from it.

answered May 7, 2018 by DareDev
• 6,850 points

Related Questions In Git & GitHub

0 votes
1 answer

How to give a file execute mode permissions in Git?

You can easily do this in one ...READ MORE

answered Aug 6, 2018 in Git & GitHub by Sophie may
• 10,100 points
4,597 views
0 votes
1 answer

How to add a remote git repository in Jenkins

Follow these steps: Step 1 Go to Manage ...READ MORE

answered May 23, 2019 in Git & GitHub by Alok
341 views
0 votes
1 answer

How to untrack a file in Git?

Hi@akhtar, You can untrack your file from git ...READ MORE

answered May 4 in Git & GitHub by MD
• 55,740 points
318 views
0 votes
1 answer

How to create branch in GitHub from my local Git repo?

Hi@akhtar, To sync your existing branch in GitHub, ...READ MORE

answered May 7 in Git & GitHub by MD
• 55,740 points
75 views
0 votes
1 answer

How to merge with squash in Git?

Hi@akhtar, If you want to merge your data ...READ MORE

answered May 13 in Git & GitHub by MD
• 55,740 points
69 views
+15 votes
2 answers

Git management technique when there are multiple customers and need multiple customization?

Consider this - In 'extended' Git-Flow, (Git-Multi-Flow, ...READ MORE

answered Mar 26, 2018 in DevOps & Agile by DragonLord999
• 8,450 points
675 views
+2 votes
1 answer
0 votes
1 answer

How to perform a sonarqube analysis from drone.io in github?

DRONE_PULL_REQUEST  env variable holds the pull request ...READ MORE

answered Jul 6, 2018 in Git & GitHub by DareDev
• 6,850 points
926 views