##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)
| #!/usr/bin/env python | |
| import select | |
| import time | |
| import psycopg2 | |
| import psycopg2.extensions | |
| import sys | |
| def get_cursor(): | |
| conn = psycopg2.connect("dbname=pgpubsub") |
Locate the section for your github remote in the .git/config file. It looks like this:
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*
url = [email protected]:joyent/node.git
Now add the line fetch = +refs/pull/*/head:refs/remotes/origin/pr/* to this section. Obviously, change the github url to match your project's URL. It ends up looking like this:
stack setup as a normal user. This will install GHC for you (under ~/.stack).stack ghci to start ghci. Please see the rest of the page linked above on how to use stack to create and build projects.
