Skip to content

RDI-3208 remove: Rebase from the source branch#28

Merged
cfoch merged 1 commit into
mainfrom
RDI-3208
May 6, 2026
Merged

RDI-3208 remove: Rebase from the source branch#28
cfoch merged 1 commit into
mainfrom
RDI-3208

Conversation

@cfoch
Copy link
Copy Markdown
Contributor

@cfoch cfoch commented Apr 29, 2026

Issue: RDI_3208

@rgonzalezfluendo
Copy link
Copy Markdown
Contributor

Adding a test for this issue would be nice.

@cfoch
Copy link
Copy Markdown
Contributor Author

cfoch commented May 4, 2026

Adding a test for this issue would be nice.

I struggle to create a passing unit test for it or my solution is not 100% correct.

@rgonzalezfluendo
Copy link
Copy Markdown
Contributor

Adding more info in the commit msg with the corner case would be nice.

@rgonzalezfluendo
Copy link
Copy Markdown
Contributor

CI is red

Comment thread tests/test_remove.py Outdated
Copy link
Copy Markdown
Contributor

@rgonzalezfluendo rgonzalezfluendo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Add a good commit msg
  • Drop debug prints

Base automatically changed from copilot/add-interactive-option-remove to main May 6, 2026 18:58
This commit fixes an issue found when trying to remove a feature
where the previous feature was an `integrated` feature. This
commit does:

1. Let _sync to select the `prev_feature` value
2. Ignore integrated features when marking the target branch
   as the last feature

Issue: RDI_3208
@cfoch cfoch merged commit 64614e2 into main May 6, 2026
2 checks passed
@cfoch cfoch deleted the RDI-3208 branch May 6, 2026 19:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants