Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,363,123
Community Members
 
Community Events
168
Community Groups

Can I commit the unconflicted changes only and resolve the conflict after ?

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.

1 answer

0 votes

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. 

Suggest an answer

Log in or Sign up to answer
TAGS

Atlassian Community Events