/merge

git mergetool

Primary LanguageC#

Certainty Merge

Create a merge tool similar to p4merge. This will be a learning process for understanding the git merge process.

Learning Areas

  • 3 way merging
  • git IO approach