I hereby claim:
- I am artpropp on github.
- I am artpropp (https://keybase.io/artpropp) on keybase.
- I have a public key ASBSfaDj23VFXXOSz0i3_qr77KtOU1UqVy2dF64HPvW4ygo
To claim this, I am signing this object:
I hereby claim:
To claim this, I am signing this object:
#!/usr/bin/env python3 | |
# Adapted from Mark Mandel's implementation | |
# https://github.com/ansible/ansible/blob/devel/plugins/inventory/vagrant.py | |
# - I assume that kid that it should link to the latest commit related to that file: | |
# https://github.com/ansible/ansible/commit/18f8fe11495d2d99e6a5101826116937792d4c79#diff-759c67299fcde66585c696c9c264cf553ed070e47b4d68a91e0eae129574f6df | |
import argparse | |
import json | |
import paramiko |
FWIW: I didn't produce the content presented here (the outline from Edmond Lau's book). I've just copy-pasted it from somewhere over the Internet, but I cannot remember what exactly the original source is. I was also not able to find the author's name, so I cannot give him/her the proper credits.
##git mergetool
In the middle file (future merged file), you can navigate between conflicts with ]c
and [c
.
Choose which version you want to keep with :diffget //2
or :diffget //3
(the //2
and //3
are unique identifiers for the target/master copy and the merge/branch copy file names).
:diffupdate (to remove leftover spacing issues)
:only (once you’re done reviewing all conflicts, this shows only the middle/merged file)
These are my notes basically. At first i created this gist just as a reminder for myself. But feel free to use this for your project as a starting point. If you have questions you can find me on twitter @thomasf https://twitter.com/thomasf This is how i used it on a Debian Wheezy testing (https://www.debian.org/releases/testing/)
Discuss, ask questions, etc. here https://news.ycombinator.com/item?id=7445545