org.eclipse.jgit.api.errors.JGitInternalException: Cannot cherry-pick commit '102f2949a03aeae22852a9a3786d2045918298a0' because it has 2 parents, only commits with exactly one parent are supported.
   at org.eclipse.jgit.api.RebaseCommand.initFilesAndRewind(RebaseCommand.java:643)
   at org.eclipse.jgit.api.RebaseCommand.call(RebaseCommand.java:234)
   at org.netbeans.libs.git.jgit.commands.RebaseCommand.run(RebaseCommand.java:114)
   at org.netbeans.libs.git.jgit.commands.GitCommand.execute(GitCommand.java:72)
   at org.netbeans.libs.git.GitClient.rebase(GitClient.java:876)
   at org.netbeans.modules.git.client.GitClient$39.call(GitClient.java:612)
   at org.netbeans.modules.git.client.GitClient$39.call(GitClient.java:608)
   at org.netbeans.modules.git.client.GitClient$CommandInvoker$1$1.call(GitClient.java:806)
   at org.netbeans.modules.git.client.GitClient$CommandInvoker$1.call(GitClient.java:825)
   at org.netbeans.modules.git.FilesystemInterceptor.runWithoutExternalEvents(FilesystemInterceptor.java:469)
   at org.netbeans.modules.git.Git.runWithoutExternalEvents(Git.java:283)
   at org.netbeans.modules.git.client.GitClient$CommandInvoker.runMethodIntern(GitClient.java:835)
   at org.netbeans.modules.git.client.GitClient$CommandInvoker.runMethod(GitClient.java:766)
   at org.netbeans.modules.git.client.GitClient$CommandInvoker.runMethod(GitClient.java:748)
   at org.netbeans.modules.git.client.GitClient$CommandInvoker.access$400(GitClient.java:742)
   at org.netbeans.modules.git.client.GitClient.rebase(GitClient.java:608)
   at org.netbeans.modules.git.ui.fetch.PullAction$GitProgressSupportImpl$Rebase.call(PullAction.java:310)
   at org.netbeans.modules.git.ui.fetch.PullAction$GitProgressSupportImpl$Rebase.call(PullAction.java:298)
   at org.netbeans.modules.git.ui.fetch.PullAction$GitProgressSupportImpl$1.call(PullAction.java:192)
   at org.netbeans.modules.git.ui.fetch.PullAction$GitProgressSupportImpl$1.call(PullAction.java:177)
   at org.netbeans.modules.versioning.indexingbridge.Bridge$1.call(Bridge.java:64)
   at org.netbeans.modules.parsing.api.indexing.IndexingManager.runProtected(IndexingManager.java:396)
   at org.netbeans.modules.versioning.indexingbridge.Bridge.runWithoutIndexing(Bridge.java:59)
   at org.netbeans.modules.versioning.util.IndexingBridge.runWithoutIndexing(IndexingBridge.java:139)
   at org.netbeans.modules.versioning.util.IndexingBridge.runWithoutIndexing(IndexingBridge.java:102)
   at org.netbeans.modules.git.utils.GitUtils.runWithoutIndexing(GitUtils.java:854)
   at org.netbeans.modules.git.ui.fetch.PullAction$GitProgressSupportImpl.perform(PullAction.java:177)
   at org.netbeans.modules.git.client.GitProgressSupport.performIntern(GitProgressSupport.java:102)
   at org.netbeans.modules.git.client.GitProgressSupport.run(GitProgressSupport.java:95)
   at org.openide.util.RequestProcessor$Task.run(RequestProcessor.java:1432)
   at org.openide.util.RequestProcessor$Processor.run(RequestProcessor.java:2042)
Caused: org.openide.util.RequestProcessor$SlowItem: task failed due to: org.eclipse.jgit.api.errors.JGitInternalException: Cannot cherry-pick commit '102f2949a03aeae22852a9a3786d2045918298a0' because it has 2 parents, only commits with exactly one parent are supported.
   at org.openide.util.RequestProcessor.post(RequestProcessor.java:424)
   at org.netbeans.modules.git.client.GitProgressSupport.start(GitProgressSupport.java:88)
   at org.netbeans.modules.git.ui.fetch.PullAction.pull(PullAction.java:131)
   at org.netbeans.modules.git.ui.fetch.PullAction$1.run(PullAction.java:117)
   at java.awt.event.InvocationEvent.dispatch(InvocationEvent.java:251)
   at java.awt.EventQueue.dispatchEventImpl(EventQueue.java:727)
   at java.awt.EventQueue.access$200(EventQueue.java:103)
   at java.awt.EventQueue$3.run(EventQueue.java:688)
   at java.awt.EventQueue$3.run(EventQueue.java:686)
   at java.security.AccessController.doPrivileged(AccessController.java:0)
   at java.security.ProtectionDomain$1.doIntersectionPrivilege(ProtectionDomain.java:76)
   at java.awt.EventQueue.dispatchEvent(EventQueue.java:697)
   at org.netbeans.core.TimableEventQueue.dispatchEvent(TimableEventQueue.java:159)
   at java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:242)
   at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:161)
   at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:150)
   at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:146)
   at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:138)
   at java.awt.EventDispatchThread.run(EventDispatchThread.java:91)