Reputation: 428
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.
Upvotes: 0
Views: 634
Reputation: 19025
You can do a fast forward merge with the following 2 steps:
git checkout develop
git merge master
Upvotes: 1