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.

Reproduce:
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.