Jump to content

Big bad merge and local uncommited work became one. How do I rescue my changes?


San Jacobs
 Share

Recommended Posts

Title says most of it. A coworker submitted a massive changeset that affected most of the files in the project, including the ones I was working on.
In my infinite wisdom, I decided to do the merge without committing my work first. The merge went badly, but couldn't find a way to undo this.
Now, my work is trapped in a changeset along with a bunch of broken files from the merge.

image.png.48e39a5475fca0e97c1c50c223843e2b.png

Is there a way to create a new changeset where the merge is undone? How do I rescue my work?

Link to comment
Share on other sites

Create an account or sign in to comment

You need to be a member in order to leave a comment

Create an account

Sign up for a new account in our community. It's easy!

Register a new account

Sign in

Already have an account? Sign in here.

Sign In Now
 Share

×
×
  • Create New...