Comments (2)
Hi @Yaminyam, thanks for raising this question!
The limitation of this tool actually matches the limitation of the cherry-pick
git command when talking about conflicts resolution, I tried to make the toolt as configurable and flexible [1] as possible such that you can set the merge strategy that fits better your use case (from those listed in the git documentation [2]).
Given that, if you are in a situation where an automated conflict resolution cannot be applied the only way I can see it is to consider that as an outlier, i.e., in such cases we were used to manually create the cherry-picked pull/merge request.
So my suggestion is to use the default merge strategy that works better for most of your use cases and change it for those cases where that was not good enough (or use the manual/raw approach to cherry-pick that commit(s)).
I hope I have fully answered your question, if not feel free to add more details 🚀
[1] https://github.com/kiegroup/git-backporting?tab=readme-ov-file#default-cherry-pick-strategy
[2] https://git-scm.com/docs/git-cherry-pick#Documentation/git-cherry-pick.txt---strategyltstrategygt
from git-backporting.
Thank you for your kind reply.
I am also implementing backport automation, and I asked this question because I thought you would be familiar with it because I have experienced related problems.
If cherry-pick fails, I'm thinking of handling it manually by leaving a comment in the original pr.
from git-backporting.
Related Issues (20)
- Keep track of requested user ids on Gitlab client
- Make merge strategy option configurable HOT 3
- Add some comments in the backporting pull request HOT 4
- Retrieve target branch from PR label(s) HOT 2
- Refactor to use DI framework
- Handle multiple `target-branch`
- Allow passing secrets as environment variable HOT 2
- Git clone by default into temporary directory HOT 1
- [Gitlab] Assignee will be Reviewer after backport HOT 3
- Support Azure DevOps HOT 1
- GITLAB_TOKEN environment variable not used for API call HOT 1
- Allow to transparently pass options to cherry-pick HOT 3
- Auto-detect the value of the no-squash option HOT 7
- no-squash: true cherry-picks commits in the wrong order HOT 2
- Create a generic `v<MAJOR>` release HOT 1
- target-branch-pattern fails to push the branch HOT 3
- Add a comment to the backported PR on failure HOT 5
- Allow enabling "Delete source branch when merge request accepted" HOT 2
- Simplify source code
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from git-backporting.