- 如果两个基于同一祖先的分支，都在没被合并前提交，并对同一文件进行了修改，修改可能会冲突，单也有可能不会（例如：一个只做了删减，一个只做了增加，互不影响）。
note: 测试冲突
add B.README
-
Notifications
You must be signed in to change notification settings - Fork 0
vnaso/git-workflow
About
No description, website, or topics provided.
Resources
Stars
Watchers
Forks
Releases
No releases published
Packages 0
No packages published