video1.0<iframe src="https://www.loom.com/embed/806decd9395a47d9bad5b6492d5f4f02" frameborder="0" width="1728" height="1296" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>12961728Loomhttps://www.loom.com12961728https://cdn.loom.com/sessions/thumbnails/806decd9395a47d9bad5b6492d5f4f02-4e271801d11ad73b.gif323.884This Loom explains how to resolve Git merge conflicts when two people modify the same file at the same time, especially on binary, image, document, and text files. It describes conflicts arising when the same line is edited in text files, and notes two scenarios: syncing changes on the same branch or merging different branches after both modified the same file. The demo shows resolving a merge state by reviewing side by side diffs, choosing which version to keep for a binary file, and for a text file using options like accept both to resolve specific conflicting lines. It then repeats the process for a branch merge, finishing with a merge commit that combines both changes and can be pushed.