search

o3de / o3de-multiplayersample

Multiplayer sample project for the Open 3D Engine
https://o3de.org
Other
84 stars 61 forks source link

Merge stabilization/2409 to main (do not apply until release day) #492

Closed nick-l-o3de closed 1 month ago

nick-l-o3de commented 1 month ago

This is the official PR to merge from stabilization/2409, into main for o3de-multiplayersample

git fetch upstream
git switch -c merge_stabilization_to_main upstream/main
git merge -X theirs --no-ff --no-commit upstream/stabilization/2409
Automatic merge went well; stopped before committing as requested

after creating the commit:

git diff upstream/stabilization/2409

(no diffs reported)