I performed a manual merge recently. The merge was committed and pushed to the server, but now we've found a major problem with it. (The problem file is the storyboard and manually undo-ing the changes will not be trivial.)
Is there a simple way to undo the change on the server and then pull the clean code back to my machine?
The safest way to do this is to right-click the bad commit, and choose "reverse commit". This will create a new commit that performs the opposite changes compared to the one you selected to reverse.
Commit the reversed changes (if SourceTree doesn't commit automatically), and push to the remote.
Git also allows you to re-write the history to remove that commit from the branch entirely, but this is generally considered bad practice because it can cause problems for the local repositories of other team members.
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