8000 GitHub - suyi91/git--eol-conflicts: 模拟merge时有crlf/lf的问题
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

suyi91/git--eol-conflicts

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

5 Commits
 
 
 
 

Repository files navigation

git--eol-conflicts

模拟merge时有crlf/lf的问题

模拟冲突

在master分支

$ git merge -s recursive feature

模拟不发生冲突

在master分支

$ git merge -s recursive -Xignore-space-at-eol feature

About

模拟merge时有crlf/lf的问题

Resources

Stars

Watchers

Forks

Releases

No releases published

Packages

No packages published
0