org.eclipse.jgit.errors.RevisionSyntaxException:refs/heads/master[Conflict]
   at org.eclipse.jgit.lib.Repository.resolve(Repository.java:706)
   at org.eclipse.jgit.lib.Repository.resolve(Repository.java:384)
   at org.eclipse.jgit.transport.RemoteRefUpdate.<init>(RemoteRefUpdate.java:192)
   at org.eclipse.jgit.transport.Transport.findRemoteRefUpdatesFor(Transport.java:646)
   at org.netbeans.libs.git.jgit.commands.PushCommand.runTransportCommand(PushCommand.java:111)
   at org.netbeans.libs.git.jgit.commands.TransportCommand.run(TransportCommand.java:191)
   at org.netbeans.libs.git.jgit.commands.GitCommand$1.run(GitCommand.java:80)
   at org.netbeans.libs.git.jgit.commands.GitCommand$1.run(GitCommand.java:77)
   at java.security.AccessController.doPrivileged(AccessController.java:0)
   at org.netbeans.libs.git.jgit.commands.GitCommand.execute(GitCommand.java:77)
   at org.netbeans.libs.git.GitClient.push(GitClient.java:1004)
   at org.netbeans.modules.git.client.GitClient$41.call(GitClient.java:651)
   at org.netbeans.modules.git.client.GitClient$41.call(GitClient.java:647)
   at org.openide.util.NetworkSettings.suppressAuthenticationDialog(NetworkSettings.java:140)
   at org.netbeans.modules.git.client.GitClient$CommandInvoker$1$1.call(GitClient.java:885)
   at org.netbeans.modules.git.client.GitClient$CommandInvoker$1.call(GitClient.java:906)
   at org.netbeans.modules.git.client.GitClient$CommandInvoker.runMethodIntern(GitClient.java:918)
   at org.netbeans.modules.git.client.GitClient$CommandInvoker.runMethod(GitClient.java:847)
   at org.netbeans.modules.git.client.GitClient$CommandInvoker.runMethod(GitClient.java:829)
   at org.netbeans.modules.git.client.GitClient$CommandInvoker.access$400(GitClient.java:823)
   at org.netbeans.modules.git.client.GitClient.push(GitClient.java:647)
   at org.netbeans.modules.git.ui.push.PushAction$3.perform(PushAction.java:282)
   at org.netbeans.modules.git.client.GitProgressSupport.performIntern(GitProgressSupport.java:114)
   at org.netbeans.modules.git.client.GitProgressSupport.run(GitProgressSupport.java:107)
   at org.openide.util.RequestProcessor$Task.run(RequestProcessor.java:1423)
   at org.openide.util.RequestProcessor$Processor.run(RequestProcessor.java:2033)