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 207062 - IllegalStateException: Conflicts
Summary: IllegalStateException: Conflicts
Status: RESOLVED DUPLICATE of bug 206530
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: Git (show other bugs)
Version: 7.1
Hardware: All All
: P3 normal (vote)
Assignee: Ondrej Vrabec
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-01-09 13:08 UTC by Exceptions Reporter
Modified: 2012-01-09 14:59 UTC (History)
4 users (show)

See Also:
Issue Type: DEFECT
Exception Reporter: 181741

Attachments
stacktrace (3.13 KB, text/plain)
2012-01-09 13:08 UTC, Exceptions Reporter 		Details
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Exceptions Reporter 2012-01-09 13:08:40 UTC 
Build: NetBeans IDE 7.1 RC2 (Build 201111302200)
VM: Java HotSpot(TM) 64-Bit Server VM, 20.4-b02-402, Java(TM) SE Runtime Environment, 1.6.0_29-b11-402-11M3527
OS: Mac OS X

User Comments:
GUEST: cherry-pick a commit

qpolarbear: NetBeans didn't even have focus.




Stacktrace: 
java.lang.IllegalStateException: Conflicts
   at org.netbeans.libs.git.jgit.JGitClient.getRepositoryState(JGitClient.java:378)
   at sun.reflect.GeneratedMethodAccessor85.invoke(GeneratedMethodAccessor85.java:0)
   at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
   at java.lang.reflect.Method.invoke(Method.java:597)
   at org.netbeans.modules.git.client.GitClientInvocationHandler.invokeClientMethod(GitClientInvocationHandler.java:280)
   at org.netbeans.modules.git.client.GitClientInvocationHandler.access$400(GitClientInvocationHandler.java:66)
Comment 1 Exceptions Reporter 2012-01-09 13:08:43 UTC 
Created attachment 114730 [details]
stacktrace
Comment 2 Ondrej Vrabec 2012-01-09 14:59:48 UTC 

*** This bug has been marked as a duplicate of bug 206530 ***