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.
You asked we answered - Summit 2019 registration is now open! Can you believe Atlassian Summit hasn’t been to the US since 2017? Now is the time to get ready for an event to remember! Our biggest u...
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