The Atlassian Community can help you and your team get more value out of Atlassian products and practices.
i committed my files in sourcetree before i pulled. how do i uncommit them so I can pull first?
the conflict is .DS_Store. what is that file? we didn't create it, but it seems to cause conflicts.