Skip to content

Conversation

@n0099
Copy link
Contributor

@n0099 n0099 commented Jul 4, 2025

@greg0ire
Copy link
Member

greg0ire commented Jul 5, 2025

Sorry for inadvertently closing your other PR yesterday, it was because I deleted the target branch.

Please kindly squash your commits together. If you don't, we'll try to remember to do it for you but it's best if you save us this trouble.

How to do that?

  1. git rebase -i origin/3.5.x, assuming origin is a git remote that points to this repository, and not your fork. If you're not sure what your remotes are, run git remote -vvv, there should be your fork and the holy/reference/base/origin/whatever-you-call-it repository.
  2. A window will show up with many lines, replace pick with fixup on every line but the first one
  3. Close your editor, git should do its magic, and you should end up with one commit
  4. Use git push --force to overwrite what you already pushed. Don't forget the --force option otherwise git will try to merge both things together.

@github-actions
Copy link
Contributor

github-actions bot commented Oct 5, 2025

There hasn't been any activity on this pull request in the past 90 days, so it has been marked as stale and it will be closed automatically if no further activity occurs in the next 7 days.
If you want to continue working on it, please leave a comment.

@github-actions github-actions bot added the Stale label Oct 5, 2025
@n0099
Copy link
Contributor Author

n0099 commented Oct 8, 2025

bump

@github-actions github-actions bot removed the Stale label Oct 9, 2025
greg0ire
greg0ire previously approved these changes Dec 21, 2025
Copy link
Member

@SenseException SenseException left a comment

Choose a reason for hiding this comment

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

This should target 3.6.x branch now.

@n0099 n0099 changed the base branch from 3.5.x to 3.6.x December 24, 2025 05:26
@n0099 n0099 dismissed greg0ire’s stale review December 24, 2025 05:26

The base branch was changed.

@greg0ire greg0ire merged commit 8cbd34c into doctrine:3.6.x Jan 1, 2026
1 check passed
@greg0ire greg0ire added this to the 3.6.1 milestone Jan 1, 2026
@greg0ire
Copy link
Member

greg0ire commented Jan 1, 2026

Thanks @n0099 !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants