Move branch head to another commit

Question

I know this is probably easy to do but I'm not managing to do it.

I want to move the develop branch up in the tree to be in line with master.

When I try to ff merge develop into master, I get the notification that is already up to date. See the image below for details.

Branch History

What sequence of commands are you using? It's hard to say what you're doing wrong when you aren't saying what you're doing. "When I try to ff merge develop into master..." Please tell us how you are ff merging develop into master. My guess is that you are not issuing the correct sequence of commands. — Raymond Chen, Commented Jul 1, 2015 at 15:11

David Deutsch · Accepted Answer · 2015-07-01 13:25:29Z

1

You can do a fast forward merge with the following 2 steps:

git checkout develop
git merge master

answered Jul 1, 2015 at 13:25

David Deutsch

18.5k4 gold badges48 silver badges54 bronze badges

This works, but I would like to understand why the other way doesn't. I Might be missing some basic logic behind the process.
– wadge
Commented Jul 1, 2015 at 13:37
1

As far as I can tell, merge does not take two arguments as described in the other answer; at least it does not seem to in my version of git. So when you type git merge develop master, git interprets it as git merge develop, and tries to merge develop into your current branch. At least, that is the behavior I see on my machine, and it seems you are seeing the same behavior.
– David Deutsch
Commented Jul 1, 2015 at 13:53

Add a comment |

TheGeorgeous · Accepted Answer · 2015-07-01 15:07:33Z

1

Merge master into develop

$ git merge master

answered Jul 1, 2015 at 12:02

TheGeorgeous

4,0322 gold badges21 silver badges35 bronze badges

Doing this gives me: "Already up to date" as described in the OP.
– wadge
Commented Jul 1, 2015 at 13:35
maybe you did it while in master
– TheGeorgeous
Commented Jul 1, 2015 at 13:38
Nop, even in upstream it gave the same message.
– wadge
Commented Jul 1, 2015 at 13:50
1

git merge develop master does not mean "Merge master into develop". It means "merge develop and master into my current branch." If your current branch is develop, then this is a nop.
– Raymond Chen
Commented Jul 1, 2015 at 15:02
git merge master does not merge master into develop. It merges master into your current branch. The OPs' problem is that the wrong branch is current. Your solution doesn't solve that.
– Raymond Chen
Commented Jul 1, 2015 at 15:10

Add a comment |

2 Answers 2