University-of-Basel-Studentprojects/Programmierprojekt
Archived
1
0
Fork 0
Code Issues 17 Pull Requests Actions Wiki Activity

Fix: Resolving Git Merge Conflicts #253

Merged
j.kropff merged 69 commits from chore/ui-checkstyle-fixes into main 2026-04-11 15:10:58 +02:00
Conversation 9 Commits 69 Files Changed 50
+2895 -266
j.kropff commented 2026-04-11 14:22:58 +02:00 (Migrated from git.scicore.unibas.ch)
Copy Link
Copy Source

The feat/game-ui branch was derived from feat/client-communication, which in turn contained feat/client-chat (with missing Checkstyle validation). feat/client-communication and feat/client-chat were both modifying the same file, leading to conflicts. The unvalidated changes from feat/client-chat and feat/client-communication are now unintentionally included in feat/game-ui.

To address this, a new branch, chore/ui-checkstyle-fixes, has been created to centrally fix the Checkstyle issues in feat/client-chat and feat/client-communication, thereby restoring clean dependencies.

Consequently, the new features for the chat UI, global chat, lobby chat and the corresponding network commands are being added.

Additionally, the features for a basic implementation of CoreClient, ChatClient, LobbyClient and GameClient will also be added.

Closes #88

The feat/game-ui branch was derived from feat/client-communication, which in turn contained feat/client-chat (with missing Checkstyle validation). feat/client-communication and feat/client-chat were both modifying the same file, leading to conflicts. The unvalidated changes from feat/client-chat and feat/client-communication are now unintentionally included in feat/game-ui. To address this, a new branch, chore/ui-checkstyle-fixes, has been created to centrally fix the Checkstyle issues in feat/client-chat and feat/client-communication, thereby restoring clean dependencies. Consequently, the new features for the chat UI, global chat, lobby chat and the corresponding network commands are being added. Additionally, the features for a basic implementation of CoreClient, ChatClient, LobbyClient and GameClient will also be added. Closes #88
m.ginkel commented 2026-04-11 14:37:21 +02:00 (Migrated from git.scicore.unibas.ch)
Copy Link
Copy Source

added 1 commit

  • a65341b6 - Style: Manually revert changes made to SuccessResponse

Compare with previous version

added 1 commit <ul><li>a65341b6 - Style: Manually revert changes made to SuccessResponse</li></ul> [Compare with previous version](/cs108-fs26/Gruppe-13/-/merge_requests/97/diffs?diff_id=14455&start_sha=b4b2e3b067efdfd656de015f693aa197631b10af)
lars.winzer commented 2026-04-11 14:38:59 +02:00 (Migrated from git.scicore.unibas.ch)
Copy Link
Copy Source

This merge request still introduces changes to components and areas unrelated to this merge request.

  1. Changes to the components of the CHECK_USERNAME command in the check_nick folder
  2. Changes to the SuccessResponse class (fixed with a65341b6)
This merge request still introduces changes to components and areas unrelated to this merge request. 1. Changes to the components of the CHECK_USERNAME command in the check_nick folder 2. Changes to the SuccessResponse class (fixed with [a65341b6](https://git.scicore.unibas.ch/cs108-fs26/Gruppe-13/-/commit/a65341b6485f644918b6280d966068d0de575726?merge_request_iid=97))
j.kropff commented 2026-04-11 14:43:57 +02:00 (Migrated from git.scicore.unibas.ch)
Copy Link
Copy Source

added 1 commit

  • cdb6d0c6 - Fix: revert wrongfully deleted line breaks

Compare with previous version

added 1 commit <ul><li>cdb6d0c6 - Fix: revert wrongfully deleted line breaks</li></ul> [Compare with previous version](/cs108-fs26/Gruppe-13/-/merge_requests/97/diffs?diff_id=14457&start_sha=a65341b6485f644918b6280d966068d0de575726)
lars.winzer commented 2026-04-11 14:45:57 +02:00 (Migrated from git.scicore.unibas.ch)
Copy Link
Copy Source

One change made to the UsernameAvailablity enum is still present, the change was introduced in this commit: https://git.scicore.unibas.ch/cs108-fs26/Gruppe-13/-/commit/590a9aa65851368ad84062b89754b22d339ca289

One change made to the `UsernameAvailablity` enum is still present, the change was introduced in this commit: https://git.scicore.unibas.ch/cs108-fs26/Gruppe-13/-/commit/590a9aa65851368ad84062b89754b22d339ca289
m.ginkel commented 2026-04-11 14:48:52 +02:00 (Migrated from git.scicore.unibas.ch)
Copy Link
Copy Source

added 1 commit

  • 69333ede - Fix: change visibility of enum UsernameAvailability

Compare with previous version

added 1 commit <ul><li>69333ede - Fix: change visibility of enum UsernameAvailability</li></ul> [Compare with previous version](/cs108-fs26/Gruppe-13/-/merge_requests/97/diffs?diff_id=14459&start_sha=cdb6d0c6b0b883ba2ed2ff5ce0f92d2db85aa8ec)
lars.winzer commented 2026-04-11 14:50:39 +02:00 (Migrated from git.scicore.unibas.ch)
Copy Link
Copy Source

Additionally the documentation for the SEND_MESSAGE and GET_NEXT_MESSAGE command is incomplete.

The description of the ChatType enum is missing.

grafik.png{width=707 height=600}

And for GET_NEXT_MESSAGE a line break is missing between the headings.

grafik.png{width=829 height=443}

Additionally the documentation for the _SEND_MESSAGE_ and _GET_NEXT_MESSAGE_ command is incomplete. The description of the ChatType enum is missing. ![grafik.png](/uploads/2075ff46bdcc9a0554cda8fd1f78f1c7/grafik.png){width=707 height=600} And for _GET_NEXT_MESSAGE_ a line break is missing between the headings. ![grafik.png](/uploads/067c5af327723e1ebe456085df2eafcb/grafik.png){width=829 height=443}
m.ginkel commented 2026-04-11 14:57:30 +02:00 (Migrated from git.scicore.unibas.ch)
Copy Link
Copy Source

added 1 commit

  • 9df30429 - Style: fix line breaks in UsernameAvailability

Compare with previous version

added 1 commit <ul><li>9df30429 - Style: fix line breaks in UsernameAvailability</li></ul> [Compare with previous version](/cs108-fs26/Gruppe-13/-/merge_requests/97/diffs?diff_id=14461&start_sha=69333ede7ab51ad92b76fa7d1e6622b4566b2b71)
m.ginkel commented 2026-04-11 15:08:02 +02:00 (Migrated from git.scicore.unibas.ch)
Copy Link
Copy Source

added 1 commit

  • 9e7a80c1 - Docs: add description of enum ChatType

Compare with previous version

added 1 commit <ul><li>9e7a80c1 - Docs: add description of enum ChatType</li></ul> [Compare with previous version](/cs108-fs26/Gruppe-13/-/merge_requests/97/diffs?diff_id=14463&start_sha=9df304297805b5d9e07c08a4846dae1088dbd345)
j.kropff commented 2026-04-11 15:10:58 +02:00 (Migrated from git.scicore.unibas.ch)
Copy Link
Copy Source

mentioned in commit f54182fde6

mentioned in commit f54182fde6444468eb54616c2f509d03a0f88f83
j.kropff (Migrated from git.scicore.unibas.ch) merged commit f54182fde6 into main 2026-04-11 15:10:58 +02:00
This repo is archived. You cannot comment on pull requests.
Reviewers
No Reviewers
Labels
Clear labels
achievement
Tasks related to milestone achievements
 bug
Issues related to programming errors on both client and server
 ci
Issues related to problems with the gitlab ci (incorrect or missing jobs)
 client
Issues (To-Dos and tasks) related to the client
 commands
Issues and tasks related to commands and thier infrastructure (CommandHandler, CommandParser, ...)
 documentation
Issues related to the documentation (for new or unclear, incorrect or incomplete entries)
 enhancement
Issues related to enhancements (also known as feature-requests)
 game-engine
Issues related to the game engine (incorrect state transitions or move validations)
 linting
Issues related to linting i.e. false detections, too generous linting, ...
 messages
Issues and tasks related to the messages and chats
 network
Issues and tasks related to the network (SessionReader / SessionWriter, Parser, ResponseBody, ...)
 outreach
Issues and tasks related to the outreach website and everything directly related to it
 server
Issues (To-Dos and tasks) related to the server
 task
Issues outlining and discussing a general task or implementation
 templates
Issues related to GitLab templates
 ui
Issues and tasks related to the client-side ui
 unit-test
Issues related to missing or already planned unit tests
 user
Issues and tasks related to the user management
No Label
Milestone
No items
No Milestone Milestone 4
Assignees
Clear assignees
lars-winzer (Lars Winzer)
No Assignees
1 Participants
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: University-of-Basel-Studentprojects/Programmierprojekt#253
Delete Branch "chore/ui-checkstyle-fixes"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?