Data Engineer's Biggest Nightmare: Solving Merge Conflicts Step-by-Step Guide with Demo

[@davidlean8674]

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

[@timbracey5434]

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.

[@smderoller]

Very detailed explaination, thanks a lot!!!

[@raulgutierrez5862]

Excellent demo! Thanks

[@sharaniyaswaminathan8760]

This is great! Thank you!🙏🏻

[@mukilanlakshmanan8968]

Very useful, thanks!

[@mgdesire9255]

What if we want to take both? Changes in the same file..

[@mr.ktalkstech]

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 :)

[@mgdesire9255]

@@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