GitHub

分支test4

冲突的情况

分支管理策略

这个是新的冲突

Name	Name	Last commit message	Last commit date
Latest commit pythonmetal merge with no-ff May 25, 2019 588a063 · May 25, 2019 History 13 Commits
README.md	README.md	merge with no-ff	May 25, 2019

Provide feedback