vieiro commented on PR #4147: URL: https://github.com/apache/netbeans/pull/4147#issuecomment-1137698734
Hi, I tried a ``` $ git rebase delivery Auto-fusionando java/libs.nbjavacapi/manifest.mf CONFLICTO (contenido): Conflicto de fusión en java/libs.nbjavacapi/manifest.mf error: no se pudo aplicar 8da225d7f7... Increment spec versions for Apache NetBeans 15 development. Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". No se pudo aplicar 8da225d7f7... Increment spec versions for Apache NetBeans 15 development. ``` But it seems there's a conflict in `java/libs.nbjavacapi/manifest.mf` (that is seems it's ready in master for NB15). Wouldn't it be easier to cherry-pick this one? On other news, I'm very consused with travis status and PHP editor failures! It this a known issue in Travis? -- 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
