You're on your way to the next level! Join the Kudos program to earn points and save your progress.
Level 1: Seed
25 / 150 points
Next: Root
1 badge earned
Challenges come and go, but your rewards stay with you. Do more to earn more!
What goes around comes around! Share the love by gifting kudos to your peers.
Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!
Join now to unlock these features and more
The Atlassian Community can help you and your team get more value out of Atlassian products and practices.
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.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.