This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.
Summary: | git merge fails on diff with white chars | ||
---|---|---|---|
Product: | versioncontrol | Reporter: | sopko |
Component: | Git | Assignee: | Ondrej Vrabec <ovrabec> |
Status: | RESOLVED DUPLICATE | ||
Severity: | normal | CC: | git |
Priority: | P3 | ||
Version: | 7.1 | ||
Hardware: | PC | ||
OS: | Windows Vista | ||
Issue Type: | DEFECT | Exception Reporter: |
Description
sopko
2011-10-14 17:38:46 UTC
Probably a crlf line-endings issue, look at bug #198451, you may find a work-around there: > Simply adding autocrlf=false does not help but follow this tutorial > http://help.github.com/dealing-with-lineendings/ > Resolved the problem (Or bypassed it!?) (In reply to comment #1) > Probably a crlf line-endings issue, look at bug #198451, you may find a > work-around there: > > Simply adding autocrlf=false does not help but follow this tutorial > > http://help.github.com/dealing-with-lineendings/ > > Resolved the problem (Or bypassed it!?) Thank you for the link, had to install Git but the described workaround worked fine. Wouldn't an option how to deal with line-ending when you close a repository fix these issues? (In reply to comment #2) > (In reply to comment #1) > > Probably a crlf line-endings issue, look at bug #198451, you may find a > > work-around there: > > > Simply adding autocrlf=false does not help but follow this tutorial > > > http://help.github.com/dealing-with-lineendings/ > > > Resolved the problem (Or bypassed it!?) > > Thank you for the link, had to install Git but the described workaround worked > fine. > > Wouldn't an option how to deal with line-ending when you close a repository fix > these issues? sorry for typo. should be 'when you clone a repository' > Wouldn't an option how to deal with line-ending when you clone a repository fix
> these issues?
Maybe, but not if you clone via a commandline client. Much better would be to have this fixed in a proper way. I'll look at it as soon as possible.
*** This bug has been marked as a duplicate of bug 198451 *** |