first commit on test branch
Merge branch 'master' into testing
first commit on test branch
test branch moving fwd
conflict resolvedf
Merge branch 'testing' of https://github.com/vumaasha/milkyway-2.0 into testing
newbranchfile.txt
conflict in branch
conflict in master
ahead 2
3 heads
merge point
Update newfile.txt
merge point
merge point