stage commit
delete file to stage
commit delete file to stage
tag test
branch1_test commit
branch2-test commit
Merge branch 'branch1_test' into branch2_test
10:45 commit
10:46 commit
dfafd
fdsafasd
dffafd
dsasfdafasd
Merge branch 'branch1_test'

Conflicts:
	MainPage.xaml.cs
dafdasf