Module merge_commit

merging from upstream

Functions

merge_upstream_commit

merge upstream using a merge commit if we did not create conflicts. if we did not create conflicts we create a merge commit and return the commit id. Otherwise we return None