Skip to content

Revert "Merge branch_9x into fs/branch_9x (up to ccf4b198ec328095d45d2746189dc8ca633e8bcf)"#21

Merged
hiteshk25 merged 1 commit intofs/branch_9xfrom
revert-20-patsonluk/fs_branch_9x_merge
Jul 18, 2023
Merged

Revert "Merge branch_9x into fs/branch_9x (up to ccf4b198ec328095d45d2746189dc8ca633e8bcf)"#21
hiteshk25 merged 1 commit intofs/branch_9xfrom
revert-20-patsonluk/fs_branch_9x_merge

Conversation

@hiteshk25
Copy link
Collaborator

Reverts #20

we merged all commits in that PR

@justinrsweeney
Copy link

What do you mean for we merged all commits in that PR? Wouldn't we want to merge our fs/branch_9x to be up to date with the common release ancestor for lucene? Just want to make sure I understand the flow here for PRs.

@hiteshk25
Copy link
Collaborator Author

What do you mean for we merged all commits in that PR? Wouldn't we want to merge our fs/branch_9x to be up to date with the common release ancestor for lucene? Just want to make sure I understand the flow here for PRs.

We squashed all commits in the last PR, instead of just merging

Copy link

@justinrsweeney justinrsweeney left a comment

Choose a reason for hiding this comment

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

Ah okay, so will do a new merge to fs/branch_9x instead of a squash. LGTM

@hiteshk25 hiteshk25 merged commit 5697c49 into fs/branch_9x Jul 18, 2023
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