test
test commit again.
committing Text1.txt
Changed Text1 in Test branch
Changing Text2.txt in master to test uncommitted checkouts prevention.
Committing overlapping changes of Text2 in test to ismulate conflict in merge branch
Changes in Text2.txt on NewTest branch to simulate fast forward merge
Merged test with master after resolving conflict
Overlapping change in text3 in master
Overlapping change in text3 in new1
Overlapping change in text3 in new2
Trying to simplify octopus merge strategy
mreged master, new1, new2
Synced with origin