Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

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

Mary Jane Foster December 31, 2020

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
Gonchik Tsymzhitov
Community Leader
Community Leader
Community Leaders are connectors, ambassadors, and mentors. On the online community, they serve as thought leaders, product experts, and moderators.
January 1, 2021

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
AUG Leaders

Atlassian Community Events