Lets say i have some uncommitted local file changes and same time someone pushed the same changed or conflicted file.
Before committing my changes, i did a pull what are the latest changes available in remote then i ran in to pull failed with conflict issue without showing to resolve with both local and remote one
How to deal with this above situation
I know i can commit that first and do a merge with latest changes but is there any way without doing commit i can do merge or conflict resolution by my own?
Any solution is greatly appreciated.
Atlassian University Live webinars provide you and your teams with the chance to strengthen your Atlassian product skills, and learn directly from Atlassian experts. Explore how to enhance...
Connect with like-minded Atlassian users at free events near you!Find an event
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no Community Events near you at the moment.Host an event
You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events