Conversation
Debido al merge conflict, se completaron las partes faltantes: - Test E2E con WireMock (GameE2ESimpleTest.java) - Archivos JSON stub (create-game-success.json, join-game-success.json, submit-move-rejected.json) - Pantalla de emparejamiento (MatchingScreen.fxml, MatchingScreenController.java) - Guía de demo local (doc/multiplayer-demo.md) El resto de la práctica #96 ya estaba implementado antes del conflicto. BUILD SUCCESS ✅" # Conflicts: # .idea/copilotDiffState.xml
Contributor
Author
|
Partes pendientes de E3-U3#96 (La mayoria estan hechos en la pantalla_emparejamiento) |
Debido al merge conflict, se completaron las partes faltantes: - Test E2E con WireMock (GameE2ESimpleTest.java) - Archivos JSON stub (create-game-success.json, join-game-success.json, submit-move-rejected.json) - Pantalla de emparejamiento (MatchingScreen.fxml, MatchingScreenController.java) - Guía de demo local (doc/multiplayer-demo.md) El resto de la práctica #96 ya estaba implementado antes del conflicto. BUILD SUCCESS ✅" # Conflicts: # .idea/copilotDiffState.xml
DamNerea
approved these changes
May 26, 2026
COrellana504
approved these changes
May 26, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.