First, make a backup of your working copy to prevent risk of losing changes.
Then, right-click on the previous commit, and choose "Reset...", and in the popup, choose "Mixed". This will remove any later commits from your branch, but will keep all of the changes from those commits in your working copy. You can then re-commit whichever changes you are ready to push, then push, then decide what to do with any remaining changes.
Make sure the commit you reset to isn't any older than the latest commit on the remote version of the branch.
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
We're bringing product updates and pro tips on teamwork to ten cities around the world.Save your spot