fix(ng-dev/pr): reset uncommitted changes after merge attempt#3788
Merged
alan-agius4 merged 1 commit intoJun 16, 2026
Conversation
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request adds a hard reset step in the merge tool's finally block to clean up any uncommitted changes, such as lockfile updates from pre-commit hooks. The feedback suggests using runGraceful instead of run for the git reset command to prevent a potential failure from blocking the rest of the cleanup process.
Ensure that the repository is cleaned up by resetting any uncommitted changes in the finally block of the merge tool. This can happen because pnpm may install the dependencies of the target branch to run pre-commit hooks, which can cause the lockfile to be updated and leave the repository in a dirty state. Resetting the changes ensures a clean state before switching back to the previous branch.
alan-agius4
force-pushed
the
fix/merge-tool-reset-changes
branch
from
0fce864 to
0c2fb41
Compare
Contributor
Author
|
This PR was merged into the repository. The changes were merged into the following branches:
|
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.
Ensure that the repository is cleaned up by resetting any uncommitted changes in the finally block of the merge tool.
This can happen because pnpm may install the dependencies of the target branch to run pre-commit hooks, which can cause the lockfile to be updated and leave the repository in a dirty state. Resetting the changes ensures a clean state before switching back to the previous branch.