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.

Bug 269334 - Slow to detect external merge conflicts in Git
Summary: Slow to detect external merge conflicts in Git
Status: NEW
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: Git (show other bugs)
Version: 8.2
Hardware: PC Other
: P3 normal (vote)
Assignee: Ondrej Vrabec
Depends on:
Reported: 2016-12-14 11:34 UTC by mwvdlee
Modified: 2016-12-14 11:34 UTC (History)
1 user (show)

See Also:
Issue Type: DEFECT
Exception Reporter:


Note You need to log in before you can comment on or make changes to this bug.
Description mwvdlee 2016-12-14 11:34:52 UTC
Netbeans sometimes takes several minutes to detect merge conflicts in Git repositories if the merge was done outside Netbeans. Even after scanning for external changes.

1. Create a git repo.
2. Create a branch `master`.
3. Create a branch `other`.
4. Make conflicting changes in both branches.
5. Merge `other` into `master` using Git Bash.
6. Netbeans takes a very long time to show the "Resolve conflict" option for the file with the merge conflict.

Netbeans quickly picks up the change and appropriately detects the diff marks (e.g. `>>>>>>>`) as code errors (in my case, invalid PHP syntax), but does not detect it as a merge conflict or enable the "Resolve conflict" option.