{"id":15045365,"url":"https://github.com/jenkinsci/git-automerger-plugin","last_synced_at":"2025-10-19T21:31:22.469Z","repository":{"id":45631235,"uuid":"189257621","full_name":"jenkinsci/git-automerger-plugin","owner":"jenkinsci","description":"Tool for auto-merging releases branches into master. ","archived":false,"fork":false,"pushed_at":"2023-06-27T22:15:25.000Z","size":119,"stargazers_count":4,"open_issues_count":1,"forks_count":4,"subscribers_count":3,"default_branch":"master","last_synced_at":"2025-01-30T04:31:43.655Z","etag":null,"topics":["git","jenkins","merger"],"latest_commit_sha":null,"homepage":"https://plugins.jenkins.io/git-automerger/","language":"Kotlin","has_issues":true,"has_wiki":null,"has_pages":null,"mirror_url":null,"source_name":null,"license":"mit","status":null,"scm":"git","pull_requests_enabled":true,"icon_url":"https://github.com/jenkinsci.png","metadata":{"files":{"readme":"README.md","changelog":"CHANGELOG.md","contributing":null,"funding":null,"license":"LICENSE","code_of_conduct":null,"threat_model":null,"audit":null,"citation":null,"codeowners":null,"security":null,"support":null,"governance":null,"roadmap":null,"authors":null,"dei":null,"publiccode":null,"codemeta":null}},"created_at":"2019-05-29T16:02:07.000Z","updated_at":"2023-10-17T18:47:14.000Z","dependencies_parsed_at":"2024-09-25T01:57:29.140Z","dependency_job_id":"8f996d3a-b205-4c93-a01c-0c5f9b794ae2","html_url":"https://github.com/jenkinsci/git-automerger-plugin","commit_stats":null,"previous_names":[],"tags_count":9,"template":false,"template_full_name":null,"repository_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/jenkinsci%2Fgit-automerger-plugin","tags_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/jenkinsci%2Fgit-automerger-plugin/tags","releases_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/jenkinsci%2Fgit-automerger-plugin/releases","manifests_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/jenkinsci%2Fgit-automerger-plugin/manifests","owner_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners/jenkinsci","download_url":"https://codeload.github.com/jenkinsci/git-automerger-plugin/tar.gz/refs/heads/master","host":{"name":"GitHub","url":"https://github.com","kind":"github","repositories_count":237215758,"owners_count":19273551,"icon_url":"https://github.com/github.png","version":null,"created_at":"2022-05-30T11:31:42.601Z","updated_at":"2022-07-04T15:15:14.044Z","host_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub","repositories_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories","repository_names_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repository_names","owners_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners"}},"keywords":["git","jenkins","merger"],"created_at":"2024-09-24T20:51:47.420Z","updated_at":"2025-10-19T21:31:22.061Z","avatar_url":"https://github.com/jenkinsci.png","language":"Kotlin","funding_links":[],"categories":[],"sub_categories":[],"readme":"[![Build Status](https://ci.jenkins.io/buildStatus/icon?job=Plugins%2Fgit-automerger-plugin%2Fmaster)](https://ci.jenkins.io/job/Plugins/job/git-automerger-plugin/job/master/)\n\nThe main purpose of this plugin is to ensure that all newer versions include all the changes from older versions.\n\n### Requirements\n\nThe plugin is merging only the branches with the following structure:\n```\n*  master\n|\n| * release/2.0\n|/\n|\n| * release/1.5\n|/\n|\n| * release/1.0\n|/\n```\n\nThe naming of release branches is flexible, but the branch name must contain a version number.\nVersions are ordered using [Apache's ComparableVersion](https://github.com/apache/maven/blob/master/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java).\n\n**Warning:** Do not use the plugin if your version system differs from `ComparableVersion`.\nThe plugin can merge newer package into older.\n\nIf you are using a different branch strategy, please fill a feature request.\n\n### Conflicts\n\nIn many cases merge conflicts can be solved automatically.\nYou could define one of available conflict resolution per file.\n\n\u003cp\u003eFor example you have conflict:\u003c/p\u003e\n\n\u003ctable\u003e\n    \u003ctr\u003e\n        \u003cth\u003erelease/1.0\u003c/th\u003e\n        \u003cth\u003erelease/1.1\u003c/th\u003e\n    \u003c/tr\u003e\n    \u003ctr\u003e\n        \u003ctd\u003eFoo\u003c/td\u003e\n        \u003ctd\u003eBar\u003c/td\u003e\n    \u003c/tr\u003e\n\u003c/table\u003e\n\n\u003cp\u003eAccording to selected resolution, one of outcome could be:\u003c/p\u003e\n\n\u003ctable\u003e\n    \u003ctr\u003e\n        \u003cth\u003eKEEP_OLDER\u003c/th\u003e\n        \u003cth\u003eKEEP_NEWER\u003c/th\u003e\n        \u003cth\u003eMERGE_NEWER_TOP\u003c/th\u003e\n        \u003cth\u003eMERGE_OLDER_TOP\u003c/th\u003e\n    \u003c/tr\u003e\n    \u003ctr\u003e\n        \u003ctd\u003eFoo\u003c/td\u003e\n        \u003ctd\u003eBar\u003c/td\u003e\n        \u003ctd\u003eBar\u003cbr/\u003eFoo\u003c/td\u003e\n        \u003ctd\u003eFoo\u003cbr/\u003eBar\u003c/td\u003e\n    \u003c/tr\u003e\n\u003c/table\u003e\n\nFor example, for `CHANGELOG.md` you would probably prefer to use `MERGE_NEWER_TOP`\n\n### Example:\n```groovy\ngitAutomerger logLevel: 'INFO',\n              mergeRules: [\n                  [path: 'CHANGELOG.md', resolution: 'MERGE_NEWER_TOP'],\n                  [path: 'version', resolution: 'KEEP_NEWER'],\n              ],\n              releaseBranchPattern: 'release/%',\n              checkoutFromRemote: true,\n              remoteName: 'origin',\n              detailConflictReport: true\n```\n\n### Testing\n\nRun server (http://localhost:8080):\n```\n./gradlew server\n```\n\n### License\n\n```\nMIT License\n\nCopyright (c) 2019 Vinted UAB\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n```\n","project_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fjenkinsci%2Fgit-automerger-plugin","html_url":"https://awesome.ecosyste.ms/projects/github.com%2Fjenkinsci%2Fgit-automerger-plugin","lists_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fjenkinsci%2Fgit-automerger-plugin/lists"}