第一个 Git 测试 Do some editing here OK the Merge! That's easy to know! clean! clean again! edit again after local merge but before local push it show the different between first merge that before push and the remote's new version after local merge but berfore local push Now, we are one!