From 49b449ded76459164c67eaa455879e4bc05f152b Mon Sep 17 00:00:00 2001 From: Dev Sahay <59460385+Synaptic149@users.noreply.github.com> Date: Mon, 23 Jun 2025 23:44:05 -0700 Subject: [PATCH 1/2] add steps on how to build one feature with multiple collaborators --- source/docs/programming/git.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/source/docs/programming/git.md b/source/docs/programming/git.md index c096d77..cb22895 100644 --- a/source/docs/programming/git.md +++ b/source/docs/programming/git.md @@ -151,6 +151,16 @@ When you wish to make a change to the code, create a new branch for said change. By following these steps, you didn't touch your `main` branch until the changes were complete. +In some cases, you may have multiple people working on a feature at once. In this case, + +1. Break down the feature into smaller tasks. +2. Create a branch for the feature. +3. From the new branch, create branches for each of the tasks. +4. Delegate the branches to different programmers. +5. Once a programmer knows their part of the feature works, have them merge their code into the feature branch. Each programmer should do this for their task. +6. Once all tasks are complete, test the feature branch. +7. Once the feature branch is stable, merge it into `main`. + ### Commiting ### Merging From 513154efad1407ecb12abf2973a9d24c6c81016d Mon Sep 17 00:00:00 2001 From: Dev Sahay <59460385+Synaptic149@users.noreply.github.com> Date: Mon, 23 Jun 2025 23:46:37 -0700 Subject: [PATCH 2/2] add merge conflict warning --- source/docs/programming/git.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source/docs/programming/git.md b/source/docs/programming/git.md index cb22895..a350e6c 100644 --- a/source/docs/programming/git.md +++ b/source/docs/programming/git.md @@ -161,6 +161,10 @@ In some cases, you may have multiple people working on a feature at once. In thi 6. Once all tasks are complete, test the feature branch. 7. Once the feature branch is stable, merge it into `main`. +!!! warning "Prone to Merge Conflicts" + + Only do this if you or someone in your team is comfortable with resolving merge conflicts, as having multiple people work on one part of a project can result in conflicting changes. + ### Commiting ### Merging