The Atlassian Community can help you and your team get more value out of Atlassian products and practices.
Hello.
I am having issues with SourceTree and Fork showing conflicts. I am using Unity and am updating specific parts of a prefab that is also being used by another colleague albeit different parts than what I'm using. The bigger problem here is that when I merge into a fresh branch off of her branch it doesn't tell me there are any conflicts and then overrides her work with mine. Does anyone know why it isn't showing conflicts in the first place?
I have tried deleting and making a brand new clone of git. Tried merging and pulling into the new branch from my original branch. All with the same result. Even used the terminal git remote prune origin.
Thank you.
Hello Sourcetree users!!! With the recent removal of Bitbucket Cloud account passwords for app passwords (please see our Bitbucket Cloud community post for details on why we made this change for se...
Connect with like-minded Atlassian users at free events near you!
Find an eventConnect with like-minded Atlassian users at free events near you!
Unfortunately there are no Community Events near you at the moment.
Host an eventYou're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events