Git
Source control
standard stack v1: git
steps for merging changes from a remote clone of a git repo