1.change content on branch, no commit, 2.switch to master, status-unstaged changes. 3.Commit on master, then check branch status: clean, but content doesn't change as in master
5.Goto testBranch, modify this file and commit Add this, to test --no-ff merge Add this on branch3, then use fast-forward merge with master Add this on branch3, then use non-fast-forward merge with master Add this on master, then use non-fast-forward merge with branch3