Skip to content

[ticket/17622] Improve handling of branches for when newer versions exist on server#6943

Merged
marc1706 merged 7 commits intophpbb:3.3.xfrom
marc1706:ticket/17622
Mar 14, 2026
Merged

[ticket/17622] Improve handling of branches for when newer versions exist on server#6943
marc1706 merged 7 commits intophpbb:3.3.xfrom
marc1706:ticket/17622

Conversation

@marc1706
Copy link
Member

@marc1706 marc1706 commented Mar 10, 2026

Checklist:

  • Correct branch: master for new features; 3.3.x for fixes
  • Tests pass
  • Code follows coding guidelines: master and 3.3.x
  • Commit follows commit message format

Tracker ticket:

https://tracker.phpbb.com/browse/PHPBB-17622

@marc1706 marc1706 added this to the 3.3.16 milestone Mar 10, 2026
@github-actions
Copy link

github-actions bot commented Mar 10, 2026

The attempt to merge branch 3.3.x into master has completed after considering the changes in this PR.

  • Merge result: Conflict ❌

A separate PR will be needed to merge 3.3.x into master.

@marc1706 marc1706 changed the title Ticket/17622 [ticket/17622] Improve handling of branches for when newer versions exist on server Mar 10, 2026
@marc1706 marc1706 merged commit 95b5c11 into phpbb:3.3.x Mar 14, 2026
43 checks passed
@marc1706 marc1706 deleted the ticket/17622 branch March 14, 2026 16:48
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.

2 participants