Avoid losing common ancestors on git history - #3459
Open
Carlos Castro Brenes (ccasbre27) wants to merge 2 commits into
Open
Avoid losing common ancestors on git history#3459Carlos Castro Brenes (ccasbre27) wants to merge 2 commits into
Carlos Castro Brenes (ccasbre27) wants to merge 2 commits into
Conversation
improve agent and skill instructions to avoid losing common ancestor when bumping packages
|
Copilot started work on behalf of
Carlos Castro Brenes (ccasbre27)
September 4, 2026 21:52
View session
Co-authored-by: ccasbre27 <10189337+ccasbre27@users.noreply.github.com>
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
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.
When bumping rooster we might use a git squash approach, which ends losing the common ancestor, and during the commit history we might see an odd timelapse. As a result, improving this. On this PR, we add instructions to the agent used to bump by developers, and also adding new steps for the skill to verify, the branch is targeting release and not using squash approach.
In addition, this is the first step of the approach, since on another PR we will add a github action to check during the build, in case the agent wasn't used.
For example: below image you can see is showing commits from around 3 months ago, while the latest bump happened around 15 days ago. So, looking forward to display only the changes made since last bump.