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
154 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,810 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
• 9,850 points
196 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 in Git & GitHub by Alok
83 views
0 votes
1 answer
0 votes
2 answers

How to view the nested workflow of a local git repository?

The closest way to view branches in ...READ MORE

answered Aug 2 in Git & GitHub by Sirajul
• 29,340 points
76 views
0 votes
1 answer

How to solve the ‘Git commit -a error’?

This happens when no editor is set. ...READ MORE

answered Jul 5, 2018 in Git & GitHub by Tyrion anex
• 8,270 points
62 views
+13 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,380 points
174 views
0 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,810 points
423 views