Merge conflicts

[HarshKapadia2]

• • [ ] Add basic merge conflict handling in the Merge Conflicts section.
• During a merge conflict, git status -s gives output UU (both in red) for files that are conflicted.
  • What is the meaning?
  • • [ ] Add it to the -s or --short flag.
• Resolving a Git conflict with binary files
  • • [ ] Add --ours and --theirs to git checkout with a reference to https://github.com/HarshKapadia2/git_internals.
  • • [ ] Write a small article on this in the General #2 section.
  • • [ ] Refer to this in https://github.com/HarshKapadia2/git_internals.