some commands for github repos
diff3 conflict style
forgot pr.sh

failing to rebase because there is merge conflict in .git/config which
really screws up everything...