Alright so I have two branches, master and develop, and I forgot to change branch after I published the code live so now I have something similar to this:
> Develop Commit 6 (origin/develop)
> Develop Commit 5
> Develop Commit 4
> Develop Commit 3 <- Where I want the master to be
> Develop Commit 2
> Develop Commit 1
> Master (origin/master)
So my question is, can I go to the master branch and merge Commit 1, 2 and 3 into the master branch? I tried to merge just Commit 3 but it looks like commit 1,2 wasn't included.
Thanks in advance!
Hi @Cimplex ,
yes, that should work.
Where are you local branches positioned? Is your develop branch in the same place as origin/develop and master branch as origin/master branch?
If so, then just checkout to master, merge commit 3 to it (use commit id) and push master to origin like this:
git checkout master
git merge Develop Commit 3
git push origin master
If it is not working, what error message do you get? Thank you.
Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...
Connect with like-minded Atlassian users at free events near you!Find an event
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no Community Events near you at the moment.Host an event
You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events