Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge next into main. #8

Merged
merged 3 commits into from
Dec 6, 2024
Merged

Merge next into main. #8

merged 3 commits into from
Dec 6, 2024

Conversation

fire
Copy link
Member

@fire fire commented Dec 5, 2024

Upgrade the engine.

@fire fire enabled auto-merge December 5, 2024 21:17
fire added 2 commits December 5, 2024 13:41
subrepo:
  subdir:   "godot"
  merged:   "92581f6ca4"
upstream:
  origin:   "https://github.com/V-Sekai/godot.git"
  branch:   "groups-4.4"
  commit:   "92581f6ca4"
git-subrepo:
  version:  "0.4.9"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "cce3d93"

git subrepo pull (merge) --force --branch=groups-4.4 godot

subrepo:
  subdir:   "godot"
  merged:   "4b7d039b0c"
upstream:
  origin:   "https://github.com/V-Sekai/godot.git"
  branch:   "groups-4.4"
  commit:   "4b7d039b0c"
git-subrepo:
  version:  "0.4.9"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "cce3d93"

git subrepo pull (merge) --force godot

subrepo:
  subdir:   "godot"
  merged:   "75727b08dc"
upstream:
  origin:   "https://github.com/V-Sekai/godot.git"
  branch:   "groups-4.3"
  commit:   "75727b08dc"
git-subrepo:
  version:  "0.4.9"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "cce3d93"
@fire fire added this pull request to the merge queue Dec 5, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Dec 5, 2024
@fire fire added this pull request to the merge queue Dec 6, 2024
@fire fire merged commit ee13cf4 into main Dec 6, 2024
14 checks passed
@fire fire deleted the next-2 branch December 6, 2024 01:06
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.

1 participant