first commit of commitedlocal.txt to local repository
second commit of stagedlocal.txt (file acting as commitedlocal.txt) to local repository
Create newupstreamfile
Merge branch 'master' of https://github.com/courtenayt/test