UpgradeNextMajorParentVersion produces merge conflicts

[gounthar]

Plugin Modernizer version

plugin modernizer 1496.ve68da_f7687de (2025-02-14T10:55:29Z)

What Operating System are you using

Debian / WSL2

Reproduction steps

java -jar plugin-modernizer-cli/target/jenkins-plugin-modernizer-1496.ve68da_f7687de.jar run --debug --plugins vmanager-plugin --recipe UpgradeNextMajorParentVersion

[...]
Getting current user using token...
(de81be1) GitHub API request: GET https://api.github.com/repos/gounthar/vmanager-plugin
(78ec89a6) GitHub API request: GET https://api.github.com/repos/gounthar/vmanager-plugin
Syncing the forked repository gounthar/vmanager-plugin
(5d3b58ca) GitHub API request: POST https://api.github.com/repos/gounthar/vmanager-plugin/merge-upstream
Failed to sync the repository
org.kohsuke.github.HttpException: {"message":"There are merge conflicts","documentation_url":"https://docs.github.com/rest/branches/branches#sync-a-fork-branch-with-the-upstream-repository","status":"409"}
        at org.kohsuke.github.GitHubConnectorResponseErrorHandler$1.onError(GitHubConnectorResponseErrorHandler.java:83)
        at org.kohsuke.github.GitHubClient.detectKnownErrors(GitHubClient.java:472)
        at org.kohsuke.github.GitHubClient.sendRequest(GitHubClient.java:439)
        at org.kohsuke.github.GitHubClient.sendRequest(GitHubClient.java:402)
        at org.kohsuke.github.Requester.fetch(Requester.java:85)
        at org.kohsuke.github.GHRepository.sync(GHRepository.java:1481)
        at io.jenkins.tools.pluginmodernizer.core.github.GHService.syncRepository(GHService.java:516)
        at io.jenkins.tools.pluginmodernizer.core.github.GHService.sync(GHService.java:500)
        at io.jenkins.tools.pluginmodernizer.core.model.Plugin.sync(Plugin.java:672)
        at io.jenkins.tools.pluginmodernizer.core.impl.PluginModernizer.process(PluginModernizer.java:356)
        at java.base/java.lang.Iterable.forEach(Iterable.java:75)
        at io.jenkins.tools.pluginmodernizer.core.impl.PluginModernizer.start(PluginModernizer.java:168)
        at io.jenkins.tools.pluginmodernizer.cli.command.RunCommand.call(RunCommand.java:99)
        at io.jenkins.tools.pluginmodernizer.cli.command.RunCommand.call(RunCommand.java:19)
        at picocli.CommandLine.executeUserObject(CommandLine.java:2045)
        at picocli.CommandLine.access$1500(CommandLine.java:148)
        at picocli.CommandLine$RunLast.executeUserObjectOfLastSubcommandWithSameParent(CommandLine.java:2465)
        at picocli.CommandLine$RunLast.handle(CommandLine.java:2457)
        at picocli.CommandLine$RunLast.handle(CommandLine.java:2419)
        at picocli.CommandLine$AbstractParseResultHandler.execute(CommandLine.java:2277)
        at picocli.CommandLine$RunLast.execute(CommandLine.java:2421)
        at picocli.CommandLine.execute(CommandLine.java:2174)
        at io.jenkins.tools.pluginmodernizer.cli.Main.main(Main.java:50)
*************
Plugin: vmanager-plugin
Error: Failed to sync the repository
Stacktrace:
io.jenkins.tools.pluginmodernizer.core.model.PluginProcessingException: Failed to sync the repository
        at io.jenkins.tools.pluginmodernizer.core.model.Plugin.addError(Plugin.java:345)
        at io.jenkins.tools.pluginmodernizer.core.github.GHService.sync(GHService.java:503)
        at io.jenkins.tools.pluginmodernizer.core.model.Plugin.sync(Plugin.java:672)
        at io.jenkins.tools.pluginmodernizer.core.impl.PluginModernizer.process(PluginModernizer.java:356)
        at java.base/java.lang.Iterable.forEach(Iterable.java:75)
        at io.jenkins.tools.pluginmodernizer.core.impl.PluginModernizer.start(PluginModernizer.java:168)
        at io.jenkins.tools.pluginmodernizer.cli.command.RunCommand.call(RunCommand.java:99)
        at io.jenkins.tools.pluginmodernizer.cli.command.RunCommand.call(RunCommand.java:19)
        at picocli.CommandLine.executeUserObject(CommandLine.java:2045)
        at picocli.CommandLine.access$1500(CommandLine.java:148)
        at picocli.CommandLine$RunLast.executeUserObjectOfLastSubcommandWithSameParent(CommandLine.java:2465)
        at picocli.CommandLine$RunLast.handle(CommandLine.java:2457)
        at picocli.CommandLine$RunLast.handle(CommandLine.java:2419)
        at picocli.CommandLine$AbstractParseResultHandler.execute(CommandLine.java:2277)
        at picocli.CommandLine$RunLast.execute(CommandLine.java:2421)
        at picocli.CommandLine.execute(CommandLine.java:2174)
        at io.jenkins.tools.pluginmodernizer.cli.Main.main(Main.java:50)
Caused by: org.kohsuke.github.HttpException: {"message":"There are merge conflicts","documentation_url":"https://docs.github.com/rest/branches/branches#sync-a-fork-branch-with-the-upstream-repository","status":"409"}
        at org.kohsuke.github.GitHubConnectorResponseErrorHandler$1.onError(GitHubConnectorResponseErrorHandler.java:83)
        at org.kohsuke.github.GitHubClient.detectKnownErrors(GitHubClient.java:472)
        at org.kohsuke.github.GitHubClient.sendRequest(GitHubClient.java:439)
        at org.kohsuke.github.GitHubClient.sendRequest(GitHubClient.java:402)
        at org.kohsuke.github.Requester.fetch(Requester.java:85)
        at org.kohsuke.github.GHRepository.sync(GHRepository.java:1481)
        at io.jenkins.tools.pluginmodernizer.core.github.GHService.syncRepository(GHService.java:516)
        at io.jenkins.tools.pluginmodernizer.core.github.GHService.sync(GHService.java:500)
        ... 15 common frames omitted
*************

Expected Results

No merge conflict. 😉