Added git merging upstream and git revert docs