Local branch on top remote
I a have a local branch called ABC. I would like to add all these changes on top the remote branch develop. I guess this is done with a merge. I have been searching and found out how to push my branch to the origin but how do I merge it on top of my already existing remote branch?
I assume the remote branch is called develop and you don't have any other develop branches:
git checkout develop git merge ABC # probably resolve conflicts and git commit git push