neight-allen/git-guis-gitx-and-diffmerge-notes.md

Created April 26, 2016 15:55

Star () You must be signed in to star a gist
Fork () You must be signed in to fork a gist

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/neight-allen/83c4422f65d83e83fcf5204462b7179a.js"></script>
Save neight-allen/83c4422f65d83e83fcf5204462b7179a to your computer and use it in GitHub Desktop.

Download ZIP

Raw

git-guis-gitx-and-diffmerge-notes.md

Electives

Gitx
- There's different versions
  - https://rowanj.github.io/gitx/
- Use cases
  - Stage
    - Making multiple small commits after a lot of work
    - Eliminating generated files
  - Viewing history
    - Finding bugs
    - What branches have been merged where?
Diffmerge
- How to install it
  - https://sourcegear.com/diffmerge/webhelp/sec__git__mac.html
- How to use it
  - Need to come up with some good merge conflicts

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment