Skip to content
This repository has been archived by the owner on Aug 5, 2024. It is now read-only.

Use the 'resolve' merge stategy for the automatic merges to the 2.0.0 branch #22

Open
kit-ty-kate opened this issue May 9, 2018 · 0 comments
Open

Use the 'resolve' merge stategy for the automatic merges to the 2.0.0 branch #22

kit-ty-kate opened this issue May 9, 2018 · 0 comments

Comments

@kit-ty-kate
Copy link
Contributor

This strategy seems to work every time (at least twice so far) a conflict arises when Camelus is trying to merge new commits + transformations to the 2.0 format to the 2.0.0 branch.
I couldn't find the merge command in the code so I'm not sure how to incorporate this but here are my two cents.

See #11943 or ocaml/opam-repository#11877 (comment) for instance
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@kit-ty-kate