You've been invited into the Kudos (beta program) private group. Chat with others in the program, or give feedback to Atlassian.
View groupJoin the community to find out what other Atlassian users are discussing, debating and creating.
Hi:
I am new to Sourcetree and I was wondering, when experiencing a conflict and I see the same object(s) in the both the staged and unstaged panels indicating there is some code that does not have a conflict, can I just commit the items where there is no conflict? Or do I have to fully resolve the conflict first?
Thank you.
Hi!
it depends on, in short - yes.
but you need to split the changes into diff commits and to branching and merging.
or rebase, or cherrypick.
Hi folks, While the full post is over on our blog I'd like to share the dark theme we've got planned for 2019 here directly as well to keep the discussion going. The ...
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
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.