Fix Kptfile pipeline not updating on pkg update with fast-forward/force-delete-replace - #4704
Open
OisinJohnston2005 wants to merge 10 commits into
Open
Fix Kptfile pipeline not updating on pkg update with fast-forward/force-delete-replace#4704OisinJohnston2005 wants to merge 10 commits into
OisinJohnston2005 wants to merge 10 commits into
Conversation
OisinJohnston2005
requested review from
efiacor,
kispaljr,
liamfallon and
mozesl-nokia
as code owners
August 17, 2026 09:28
✅ Deploy Preview for kptdocs ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
dosubot
Bot
added
size:L
Signed-off-by: Oisin Johnston <oisin.johnston@ericsson.com>
Signed-off-by: Oisin Johnston <oisin.johnston@ericsson.com>
Signed-off-by: Oisin Johnston <oisin.johnston@ericsson.com>
Signed-off-by: Oisin Johnston <oisin.johnston@ericsson.com>
Signed-off-by: Oisin Johnston <oisin.johnston@ericsson.com>
Signed-off-by: Oisin Johnston <oisin.johnston@ericsson.com>
Signed-off-by: Oisin Johnston <oisin.johnston@ericsson.com>
OisinJohnston2005
force-pushed
the
pkg-update-not-updating-kptfile
branch
from
August 20, 2026 11:34
e1ee784 to
6b17844
Compare
Signed-off-by: Oisin Johnston <oisin.johnston@ericsson.com>
|
Contributor
Author
|
SonarQube is only complaining because it's still including |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #4012
With test cases taken from #4030
Instead of performing a three way merge the KPT file is directly updated from upstream when using strategies that should not respect local changes like fast-forward and force-delete-replace, allowing the upstream to update the pipeline.