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

Resolving Git Merge Conflicts #88

New Issue
Closed
opened 2026-04-11 13:55:04 +02:00 by j.kropff · 8 comments
j.kropff commented 2026-04-11 13:55:04 +02:00 (Migrated from git.scicore.unibas.ch)
Copy Link
Copy Source

Task

Resolving Git Merge Conflicts

Summary

Resolving Git Merge Conflicts of feat/client-communication and feat/client-chat.

By @jona.walpert , @m.ginkel and @j.kropff

Context

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.

Proposed solution: Create a separate branch, chore/ui-checkstyle-fixes, in which the Checkstyle issues are centrally resolved for feat/client-chat and feat/client-communication to restore clean dependencies.

Checklist

  • I outlined checkpoints describing phases of my work related to this task
  • I added relevant labels
  • I linked to other issues or branches that must be completed first
## Task **Resolving Git Merge Conflicts** ### Summary **Resolving Git Merge Conflicts of feat/client-communication and feat/client-chat.** **By** @jona.walpert , @m.ginkel and @j.kropff ### Context 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. Proposed solution: Create a separate branch, chore/ui-checkstyle-fixes, in which the Checkstyle issues are centrally resolved for feat/client-chat and feat/client-communication to restore clean dependencies. ### Checklist - [x] I outlined checkpoints describing phases of my work related to this task - [x] I added relevant labels - [x] I linked to other issues or branches that must be completed first
j.kropff commented 2026-04-11 13:55:04 +02:00 (Migrated from git.scicore.unibas.ch)
Copy Link
Copy Source

changed start date to April 11, 2026 and changed due date to April 11, 2026

changed start date to April 11, 2026 and changed due date to April 11, 2026
j.kropff commented 2026-04-11 14:05:10 +02:00 (Migrated from git.scicore.unibas.ch)
Copy Link
Copy Source

mentioned in commit b4b2e3b067

mentioned in commit b4b2e3b067efdfd656de015f693aa197631b10af
j.kropff commented 2026-04-11 14:23:02 +02:00 (Migrated from git.scicore.unibas.ch)
Copy Link
Copy Source

mentioned in merge request !97

mentioned in merge request !97
j.kropff commented 2026-04-11 14:43:56 +02:00 (Migrated from git.scicore.unibas.ch)
Copy Link
Copy Source

mentioned in commit cdb6d0c6b0

mentioned in commit cdb6d0c6b0b883ba2ed2ff5ce0f92d2db85aa8ec
m.ginkel commented 2026-04-11 14:48:50 +02:00 (Migrated from git.scicore.unibas.ch)
Copy Link
Copy Source

mentioned in commit 69333ede7a

mentioned in commit 69333ede7ab51ad92b76fa7d1e6622b4566b2b71
m.ginkel commented 2026-04-11 14:57:29 +02:00 (Migrated from git.scicore.unibas.ch)
Copy Link
Copy Source

mentioned in commit 9df3042978

mentioned in commit 9df304297805b5d9e07c08a4846dae1088dbd345
m.ginkel commented 2026-04-11 15:08:00 +02:00 (Migrated from git.scicore.unibas.ch)
Copy Link
Copy Source

mentioned in commit 9e7a80c17d

mentioned in commit 9e7a80c17d21611b128b57a3531345a1f281a19f
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) closed this issue 2026-04-11 15:10:59 +02:00
This repo is archived. You cannot comment on issues.
No Branch/Tag Specified
Branches Tags
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 bug client linting task
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#88
Delete Branch "%!s()"

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?