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 creates conflicts if file changed it's location | ||
---|---|---|---|
Product: | versioncontrol | Reporter: | fedind |
Component: | Git | Assignee: | Ondrej Vrabec <ovrabec> |
Status: | NEW --- | ||
Severity: | normal | CC: | git |
Priority: | P3 | ||
Version: | 7.2 | ||
Hardware: | PC | ||
OS: | Windows 7 | ||
URL: | https://bugs.eclipse.org/bugs/show_bug.cgi?id=372606 | ||
Issue Type: | ENHANCEMENT | Exception Reporter: | |
Attachments: | IDE log |
Description
fedind
2012-07-06 17:29:54 UTC
Created attachment 121791 [details]
IDE log
i believe this is what we're blocked by: https://bugs.eclipse.org/bugs/show_bug.cgi?id=372606 - a JGit request for this. +1 to this. Would dramatically improve the usefulness of Git with NetBeans. |