Nice explanation. I preferred the merge conflict detection in Visual Studio. Where you saw 3 columns; Left Source, Right Source & Final. Giving you check boxes on each conflict line to decide what the Final will look like. If you checked both you got an extra line. Especially handy for variable declarations, comments & formatting changes.
@Learn2Share786Ай бұрын
Great explanation, looking forward to see cherry picking scenarios in Azure DevOps
@timbracey543426 күн бұрын
Great video. If there are multiple conflicts, I assume it will let you resolve them one by one? What has me concerned is when it said take whole file. I wasn’t sure if that pertained to the single conflict or all conflicts.
@smderoller2 ай бұрын
Very detailed explaination, thanks a lot!!!
@raulgutierrez58622 ай бұрын
Excellent demo! Thanks
@sharaniyaswaminathan87602 ай бұрын
This is great! Thank you!🙏🏻
@mukilanlakshmanan89682 ай бұрын
Very useful, thanks!
@mgdesire92552 ай бұрын
What if we want to take both? Changes in the same file..
@mr.ktalkstech2 ай бұрын
Good Question, this would require manual intervention in merging those changes together / looking into the cherry picking option, I will cover this scenario in a separate video :)
@mgdesire92552 ай бұрын
@@mr.ktalkstech sure thank you sir..please create a video on it.. that helps many folks.🙌🙌
@jithendragoalla551Ай бұрын
This question was asked in my recent interview but i'm unable to answer