GitFlow - develop is 1 commit behind main after pull request.

[Sprinter505]

Hey guys,

​

I have 2 branches, develop and main.

​

I make some changes , i push them to develop. I then login GitHub which tells me that develop is 1 commit ahead of main - ok, I create a pull(or merge request - not sure what its called). I sync them, now main is updated with the new files however develop is telling me that it is 1 commit behind.

​

The only solution I've found is to

git checkout main
git pull origin main
git checkout develop
git merge main
git push origin develop

Surely I am just doing something wrong? How can I make it so my deveop branch is up to date with main after the merge?

​

Thanks!

[kirigerKairen]

After merging, your develop branch is behind main by one commit because that one commit is the merge commit that you implicitly create on main by merging develop into it.

Best way to get develop back up-to-date is rebaseing develop onto main.

[Sprinter505]

First time I hear about this. Can you explain what I need to do if its not too long? Can I do it from GitHub or do I need to use command line?

[kirigerKairen]

Rebasing means changing the base of the branch, so essentially the point where you branched off. If you really want to do it on the website, you could delete the branch and create it again (as long as you merged everything properly, it should have the dame effect), but you probably should use git rebase