Skip to content

Instantly share code, notes, and snippets.

@terrehbyte

terrehbyte/diff3.md

Last active April 17, 2020 14:22
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save terrehbyte/0b4749c81799ce8f6833 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save terrehbyte/0b4749c81799ce8f6833 to your computer and use it in GitHub Desktop.
Download ZIP
Understanding Git Diff diff3
Raw
diff3.md

What You See

<<<<<<< HEAD
///     Merged with dev for @emlowry Sprite refactor
||||||| merged common ancestors
///     Refactoring Sprite class
=======
///     Refactoring Animation class
>>>>>>> dev

What It Means

<<<<<<< HEAD
// MINE - WHAT I CHANGED
||||||| merged common ancestors
// ORIGINAL - WHAT WAS THERE BEFORE EITHER ONE OF US CHANGED ANYTHING
=======
// THEIRS - WHAT THEY CHANGED
>>>>>>> dev
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment