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

Mary Jane Foster

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.

Gonchik Tsymzhitov

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.