Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[BUG] Backports onto 2.x often run into conflicts #3090

Closed
peternied opened this issue Aug 2, 2023 · 2 comments · Fixed by #3092
Closed

[BUG] Backports onto 2.x often run into conflicts #3090

peternied opened this issue Aug 2, 2023 · 2 comments · Fixed by #3092
Assignees
@peternied
Labels
bug Something isn't working triaged Issues labeled as 'Triaged' have been reviewed and are deemed actionable.

Comments

@peternied
Copy link
Member

What is the bug?
We are having to manually resolve conflicts when attempting to backport changes from main into 2.x

How can one reproduce the bug?

  1. Try to backport a change from main into core, such as Bump JSON libs #2926
  2. Wait on the pull request
  3. See backport failed message

What is the expected behavior?
Conflicts should only occur when there is a significant difference - there are many changes that have not been backported that are causing conflicts

Do you have any additional context?
Seems like this is due to some large backports into 2.x that did not use the automated tooling and we've got changes that never made it into the 2.x branch
@peternied peternied added bug Something isn't working untriaged Require the attention of the repository maintainers and may need to be prioritized labels Aug 2, 2023
@peternied peternied changed the title [BUG] Backports onto 2.x always run into conflicts [BUG] Backports onto 2.x often run into conflicts Aug 2, 2023
@peternied
Copy link
Member Author

peternied commented Aug 2, 2023 •
edited
Loading

Found the following dependency version number changes that need to be backported into 2.x:

@peternied peternied self-assigned this Aug 2, 2023
@peternied
Copy link
Member Author

@peternied peternied mentioned this issue Aug 2, 2023
Merged
8 tasks
peternied added a commit that referenced this issue Aug 3, 2023
@peternied @willyborankin
[Backport 2.x] Synchronize major changes from main (#3092)
159698f 
Manual backports have been failing for a while, specifically the failure
on #2926 clued me
into the issue, we've been manually resolving these conflicts, but we
should be trying to keep everything in sync as much as possible, this
set of backports lumped together attempts to handle that.

### Issues Resolved
- Resolves #3090

### Testing
Lots of `/gradlew testClasses`, CI checks should verify everything else.

Signed-off-by: Peter Nied <petern@amazon.com>
Signed-off-by: Andrey Pleskach <ples@aiven.io>
Co-authored-by: Andrey Pleskach <ples@aiven.io>
@peternied peternied added triaged Issues labeled as 'Triaged' have been reviewed and are deemed actionable. and removed untriaged Require the attention of the repository maintainers and may need to be prioritized labels Aug 4, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@peternied peternied

Labels
bug Something isn't working triaged Issues labeled as 'Triaged' have been reviewed and are deemed actionable.
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

[Backport 2.x] Synchronize major changes from main peternied/security
1 participant
@peternied