fix: use git add -u in merge script to avoid orphaned gitlinks#1133
Merged
fix: use git add -u in merge script to avoid orphaned gitlinks#1133
Conversation
"git add -A" stages all untracked content, including stray cloned repositories that happen to exist in the worktree. These get recorded as orphaned gitlinks, which break ArgoCD sync because the referenced submodule commits do not exist in the remote. "git add -u" limits staging to already-tracked files, which is the correct intent during conflict resolution. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Contributor
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Organization UI Review profile: ASSERTIVE Plan: Pro Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
Contributor
Author
Filed #1134 to improve that. |
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
2 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.
Summary
git add -Awithgit add -uinscripts/rebase-main-to-alpha.sh(both occurrences on lines 67 and 87)git add -Astages all untracked content, including stray cloned repositories in the worktree, which get recorded as orphaned gitlinks that break ArgoCD syncgit add -uonly stages changes to already-tracked files, which is the correct behavior during conflict resolutionFixes #1131