Skip to content

Feature/conflict b #76

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.

Sign up for GitHub

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

Open
quentinmss18 wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Feature/conflict b #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2f69c63
Update introduction document
quentinmss18 Feb 15, 2026
ea623d0
Update history document
quentinmss18 Feb 15, 2026
ee88608
Merge pull request #2 from quentinmss18/feature/intro-update
quentinmss18 Feb 15, 2026
c28d701
Merge pull request #1 from quentinmss18/feature/history-update
quentinmss18 Feb 15, 2026
2578ced
Update first paragraph for conflict scenario B
quentinmss18 Feb 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/collaboration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Collaboration Guidelines

Collaboration in this project is intentionally simple so that the focus remains on learning version control practices. Contributors are encouraged to make small, focused changes and to explain their reasoning clearly in commit messages and pull requests.
Effective teamwork depends on continuous feedback and shared understanding.

When multiple people work on these documents, it is common for changes to overlap. Overlapping changes can lead to merge conflicts, which are a normal part of a collaborative workflow.

The most important aspect of collaboration is communication. Comments in pull requests, documentation updates, and clear descriptions of changes all help maintain a shared understanding of the project.
The most important aspect of collaboration is communication. Comments in pull requests, documentation updates, and clear descriptions of changes all help maintain a shared understanding of the project.
3 changes: 2 additions & 1 deletion docs/history.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ This documentation project started as a simple collection of notes about collabo

Initially, only a single contributor updated these files. As more people joined, it became clear that branches, pull requests, and reviews were necessary to keep the history organized and understandable.

Today, the repository is used by small groups to simulate how a team would maintain documentation over multiple iterations.
Today, the repository is used by small groups to simulate how a team would maintain documentation over multiple iterations.
This history section has been updated as part of collaborative work.
3 changes: 2 additions & 1 deletion docs/introduction.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ This documentation project is used to practice collaborative workflows with Git

The goal of this project is to provide a small but realistic set of documents that multiple people can edit at the same time. Each change is made in a separate branch and is proposed through a pull request.

New contributors can use this repository to practice how to read existing documentation, decide what needs to be improved, and propose clear, focused updates.
New contributors can use this repository to practice how to read existing documentation, decide what needs to be improved, and propose clear, focused updates.
This introduction has been updated as part of collaborative work.