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.
I would expect the pull to have worked and shown the conflicts locally, can you screen shot what happens.
However the other way around this would be to Stash you local changes and then pull and then re-apply your stash over the top.
I’m Jess, a Product Marketer for Jira Software Server and Data Center, and now a huge fan of our products. Read on for a 90 day, new-hire perspective on what it’s like to standardize on the Atlassian...
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