It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

Setup SourceTree with Stash and Pull Requests

Hi,

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.

Thanks

1 answer

0 votes
minnsey Atlassian Team Nov 30, 2017

Hi

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.

Suggest an answer

Log in or Sign up to answer
Community showcase
Published in Training & Certification

Atlassian University Live: Content Management with Confluence

  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...

38 views 0 2
Read article

Community Events

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

Events near you