Conflicts should be resolved after backporting missing PR's
Open
Nobody has claimed this yet.
- Dominant language
- No language data
- Stars
- 339
- Forks
- 93
- PR merge metrics
- No merged PRs in 30d
Description
Expected Behavior
When trying to backport one PR, I figure out that previous one was missing causing conflicts.
So, first I backport previous one and I expect the initial one conflicts to be fixed.
Actual Behavior
Conflicts stay and need to resolve them manually.
Steps to Reproduce the Problem
- Create 2 PR's that change the same thing
- Try to backport the second one - cause conflict
- Backport 1st one - see still conflicts are present
Contributor guide
No contributing guide indexed for this repository
First steps
- Read the whole issue, then the project's contributing guide.
- Comment on the issue to say you are picking it up — it saves two people doing the same work.
- Fork the repository and make your change on a branch.
- Open a pull request that references the issue number.
Research direction
The report names no files or tests. Reproduce the two-PR backport sequence described in the issue, then trace the backport conflict-handling entry point. Done means that backporting the missing earlier PR clears or recalculates the later PR's conflict state, with a regression test for the sequence.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- git, github, python
- Domain
- devops, tooling
- Issue type
- Bug
- Difficulty
- 4/5
- Estimated time
- 3-5 days
- Activity status
- Stale
- Clarity
- Clearly specified
- Newbie friendliness
- 38/100