Comments (3)
Thanks for the report @jfcherng.
I'm currently investigating this, and it should be fixed in the next build.
-Dylan
from merge.
@DylanJohnston I am afraid that this is not fixed in a correct manner. Tested on build 1062. The file still gets CRLF after resolving conflicts. Test repo is the same one with the original post.
from merge.
Fixed in 1063.
from merge.
Related Issues (20)
- Symbolic Link handling on Windows HOT 3
- Commit message length HOT 7
- Partial stash HOT 1
- Compact tree for branches from same base commit HOT 2
- Unmodified submodules marked unstaged
- Allow smerge to be used as editor for git-difftool, git-mergetool HOT 10
- Allow copying of commit hashes HOT 3
- Possible problems running on CentOS 7?
- Chinese input method support is not good HOT 1
- Changing casing in a windows path breaks staging HOT 1
- See some confusing "contents unchaged" in the commit log HOT 2
- Staging and discarding multiple files at once HOT 1
- When pre-commit hook fails, commit message is lost HOT 3
- Hang when closing a specific repository window. HOT 7
- Rename Branch new name erased on backspace HOT 3
- Create Branch From Tag option HOT 1
- Copy Branch Name option HOT 1
- Opening a new repo with command palette open causes it to stick HOT 1
- Commits with a tag but no branch are not visible HOT 1
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from merge.