Compare upstream with common ancestor to see if a rebase might be needed
Add a test for list_upstream_changes
Use a custom PR representation so #NUMBER can be auto-linked
Unrelated cleanup, use get_current_sha1 in safe_merge.
Move concflict msg creation into a separate function