I'm working on a github branch off of master. Recently after merging master into my branch I did a commit and push to the remote repository, then discovered something bad happened during the merge. I don't know how to get past the bad merge that's now in the remote. I can reset my local repository to my previous good commit on my branch to continue work, but when I want to commit and push up to the remote repository, I can't because the remote is ahead of my local (by the bad commit). I can't pull from the remote because the bad commit messes up my local so I can't build. How do I recover from this?
You have two options:
Badges are a great way to show off community activity, whether you’re a newbie or a Champion.Learn more
Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...
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