Arianule
Arianule

Reputation: 9043

No changes to push after merge with branch

I am tying to do something that I have done many times before but for some or other reason it is not working as expected.

I want to merge changes from a develop branch into a master branch.

First I create a branch of master.

git checkout -b merge-develop-master
Switched to a new branch 'merge-develop-master'

then

git merge develop

This results in a whole list of changes that gets merged

when I now type git status it tells me

On branch merge-develop-master
nothing to commit, working tree clean

Now when I type git push --set-upstream origin merge-develop-master no changes gets pushed,

Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
To https://xxx-xxx-xxx
 * [new branch]        merge-develop-master -> merge-develop-master
 Branch 'merge-develop-master' set up to track remote branch 'merge-develop-master' from 
 'origin'.

How can I push these changes, what am I doing wrong?

Thanks

Upvotes: 1

Views: 2063

Answers (1)

deric4
deric4

Reputation: 1326

This is likely because your develop and merge-develop-master are identical

If you run git log you should see the latest commit points to both branches.

This means when you push upstream, there aren’t any changes that need to be sent. Your upstream just creates a new branch pointing to a commit it already knows about.

Upvotes: 1

Related Questions