matthiasblaesing commented on PR #4189:
URL: https://github.com/apache/netbeans/pull/4189#issuecomment-1152529405
The conflict is in
`extide/gradle/nbproject/org-netbeans-modules-gradle.sig`. I assume, that a
recent update of the gradle module broadend the API and thus both branches
have changes in that file. The diff looks trivial:
```diff
diff --cc extide/gradle/nbproject/org-netbeans-modules-gradle.sig
index a1d7b3483313,10434b6c15b2..000000000000
--- a/extide/gradle/nbproject/org-netbeans-modules-gradle.sig
+++ b/extide/gradle/nbproject/org-netbeans-modules-gradle.sig
@@@ -280,6 -297,24 +280,27 @@@ meth public static org.netbeans.modules
meth public static
org.netbeans.modules.gradle.api.NbGradleProject$Quality[] values()
supr
java.lang.Enum<org.netbeans.modules.gradle.api.NbGradleProject$Quality>
++<<<<<<< HEAD
++=======
+ CLSS public abstract interface
org.netbeans.modules.gradle.api.NbProjectInfo
+ innr public abstract interface static Report
+ intf org.gradle.tooling.model.Model
+ intf org.netbeans.modules.gradle.tooling.Model
+ meth public abstract boolean getMiscOnly()
+ meth public abstract java.util.Map<java.lang.String,java.lang.Object>
getExt()
+ meth public abstract java.util.Map<java.lang.String,java.lang.Object>
getInfo()
+ meth public abstract java.util.Set<java.lang.String> getProblems()
+ meth public abstract
java.util.Set<org.netbeans.modules.gradle.api.NbProjectInfo$Report> getReports()
+
+ CLSS public abstract interface static
org.netbeans.modules.gradle.api.NbProjectInfo$Report
+ outer org.netbeans.modules.gradle.api.NbProjectInfo
+ meth public abstract int getLineNumber()
+ meth public abstract java.lang.String getErrorClass()
+ meth public abstract java.lang.String getMessage()
+ meth public abstract java.lang.String getScriptLocation()
+ meth public abstract org.netbeans.modules.gradle.api.NbProjectInfo$Report
getCause()
+
++>>>>>>> github/pr/4189
CLSS public abstract interface
org.netbeans.modules.gradle.api.execute.ActionMapping
fld public final static java.lang.String CUSTOM_PREFIX = "custom-"
innr public final static !enum ReloadRule
```
I suggest to merge locally and accept the version from master for this file.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
