I'm working on a project with several other people and we are hosting the whole thing on github.
We have created a branch to work on some new feature and several of us contributed to that branch. Along the way, before pushing our change back to origin/feature on github, we would pull and rebase, then push our changes.
The problem i have now, is that I would like to keep that branch (origin/feature) up to date compared to the origin/master branch on github.
I tried interactive rebase in source tree by:
- checking out master, pulling the latest version from origin
- checking out the feature branch, pulling the latest version from origin
- right clicking on the local/master branch and selecting rebase rebase current change onto master
- fixing any merge conflicts and completing the rebase
=>when i try to push, it tells me i can't because my branch is behind and if i pull, the pull essentially undo all the rebase i just did and simply adds more changes on my feature branch.
The only idea that i have, is that i'm trying to rebase locally and it seem like i need to rebase on the server directly to get this working, but i can't find out how to do that either.
Any help appreciated, olivier
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 a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs