Skip to content

sauchye/FixMergeConflict

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

6 Commits
 
 
 
 
 
 

Repository files navigation

FixMergeConflict

解决多人开发冲突,简单实用!

1.使用:直接将fixPbxprojConfict.sh 拷贝到项目根目录下

2.sh即可

3.感谢知名的iOS开发者:@heyuan

About

解决多人开发冲突,简单实用!

Resources

Stars

Watchers

Forks

Releases

No releases published

Packages

No packages published

Languages