From f0d4f36f479658996ce63452e334b0d33c4ec9d2 Mon Sep 17 00:00:00 2001 From: Derek Karungani Date: Thu, 26 Dec 2024 12:35:07 -0600 Subject: [PATCH 01/42] Updated group norms in README --- collaboration/README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/collaboration/README.md b/collaboration/README.md index 20889b951..2fe52247a 100644 --- a/collaboration/README.md +++ b/collaboration/README.md @@ -1,5 +1,11 @@ # Collaboration +Building and Maintaining Trust - +1. Cognitive Trust: +Demonstrate reliability by pulling your weight in terms of meeting deadlines, delivering quality work, and keeping commitments +2. Affective Trust: +Develop personal connections through empathy, active listening, and acknowledgement of team members' efforts. +Give and seek open, positive, and constructive feedback that will serve to create a nurturing environment + . From f4569b80a772d05e5183114e0b130bd3c47c7e4b Mon Sep 17 00:00:00 2001 From: Derek Karungani Date: Fri, 27 Dec 2024 09:24:00 -0600 Subject: [PATCH 02/42] Updated README.md with additional changes --- collaboration/README.md | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/collaboration/README.md b/collaboration/README.md index 2fe52247a..82a7b7cca 100644 --- a/collaboration/README.md +++ b/collaboration/README.md @@ -1,11 +1,28 @@ # Collaboration -Building and Maintaining Trust -1. Cognitive Trust: -Demonstrate reliability by pulling your weight in terms of meeting deadlines, delivering quality work, and keeping commitments -2. Affective Trust: -Develop personal connections through empathy, active listening, and acknowledgement of team members' efforts. -Give and seek open, positive, and constructive feedback that will serve to create a nurturing environment +We are committed to fostering a respectful, inclusive, and collaborative environment that values trust, open communication, and mutual support. These norms will guide our interactions and help us achieve our shared goals while accommodating individual differences and challenges. By adhering to these principles, we aim to create a team culture that drives success and personal growth. + . + + 1. Foster a Safe and Inclusive Environment +Create a supportive space where everyone feels comfortable sharing ideas, asking questions, and expressing challenges, including mental health concerns, without fear of judgment. + 2. Build and Maintain Trust +Commit to delivering quality work, meeting deadlines, and keeping promises. Encourage openness and collaboration by sharing expertise and asking for help when needed. + 3. Resolve Issues Constructively +Approach challenges with empathy and focus on solutions. Use open, non-confrontational communication, and involve mediation if necessary to maintain professionalism and respect. + 4. Balance Collaboration and Decision-Making +Use discussions for brainstorming and debates for decision-making, ensuring all perspectives are valued and disagreements are handled constructively. + 5. Respect Each Member’s Time +Plan meetings only when essential, provide agendas in advance, and use shared tools to accommodate schedules and streamline communication. + 6. Ensure Transparent Communication +Use appropriate channels for updates, technical discussions, and decision-making. Strive for clarity and accessibility in all exchanges. + 7. Celebrate Contributions and Milestones +Recognize and celebrate team achievements to foster a positive and motivating atmosphere. + 8. Adapt and Support Flexibility +Be adaptable to personal challenges or unforeseen issues while maintaining a forgiving and understanding spirit. + 9. Reflect and Improve Together +Regularly review team processes and suggest improvements to enhance collaboration, productivity, and growth. + 10. Strive for Shared Purpose and Growth +Align individual and team goals to ensure meaningful contributions and mutual development, fostering a sense of purpose and shared accomplishments. From 6667d2450c4796a939ee7e7ec1c407a65644ca05 Mon Sep 17 00:00:00 2001 From: Derek Karungani Date: Fri, 27 Dec 2024 09:52:15 -0600 Subject: [PATCH 03/42] Updated README.md with additional changes --- collaboration/README.md | 51 +++++++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/collaboration/README.md b/collaboration/README.md index 82a7b7cca..749f55ab7 100644 --- a/collaboration/README.md +++ b/collaboration/README.md @@ -6,23 +6,34 @@ We are committed to fostering a respectful, inclusive, and collaborative environ . - 1. Foster a Safe and Inclusive Environment -Create a supportive space where everyone feels comfortable sharing ideas, asking questions, and expressing challenges, including mental health concerns, without fear of judgment. - 2. Build and Maintain Trust -Commit to delivering quality work, meeting deadlines, and keeping promises. Encourage openness and collaboration by sharing expertise and asking for help when needed. - 3. Resolve Issues Constructively -Approach challenges with empathy and focus on solutions. Use open, non-confrontational communication, and involve mediation if necessary to maintain professionalism and respect. - 4. Balance Collaboration and Decision-Making -Use discussions for brainstorming and debates for decision-making, ensuring all perspectives are valued and disagreements are handled constructively. - 5. Respect Each Member’s Time -Plan meetings only when essential, provide agendas in advance, and use shared tools to accommodate schedules and streamline communication. - 6. Ensure Transparent Communication -Use appropriate channels for updates, technical discussions, and decision-making. Strive for clarity and accessibility in all exchanges. - 7. Celebrate Contributions and Milestones -Recognize and celebrate team achievements to foster a positive and motivating atmosphere. - 8. Adapt and Support Flexibility -Be adaptable to personal challenges or unforeseen issues while maintaining a forgiving and understanding spirit. - 9. Reflect and Improve Together -Regularly review team processes and suggest improvements to enhance collaboration, productivity, and growth. - 10. Strive for Shared Purpose and Growth -Align individual and team goals to ensure meaningful contributions and mutual development, fostering a sense of purpose and shared accomplishments. +## 🌟 Group Norms for Collaboration + +1. **🌈 Foster a Safe and Inclusive Environment** + Create a supportive space where everyone feels comfortable sharing ideas, asking questions, and expressing challengesβ€”including mental health concernsβ€”without fear of judgment. + +2. **🀝 Build and Maintain Trust** + Commit to delivering quality work, meeting deadlines, and keeping promises. Encourage openness and collaboration by sharing expertise and asking for help when needed. + +3. **πŸ’‘ Resolve Issues Constructively** + Approach challenges with empathy and focus on solutions. Use open, non-confrontational communication, and involve mediation if necessary to maintain professionalism and respect. + +4. **βš–οΈ Balance Collaboration and Decision-Making** + Use discussions for brainstorming and debates for decision-making, ensuring all perspectives are valued and disagreements are handled constructively. + +5. **⏰ Respect Each Member’s Time** + Plan meetings only when essential, provide agendas in advance, and use shared tools to accommodate schedules and streamline communication. + +6. **πŸ“’ Ensure Transparent Communication** + Use appropriate channels for updates, technical discussions, and decision-making. Strive for clarity and accessibility in all exchanges. + +7. **πŸŽ‰ Celebrate Contributions and Milestones** + Recognize and celebrate team achievements to foster a positive and motivating atmosphere. + +8. **πŸ”„ Adapt and Support Flexibility** + Be adaptable to personal challenges or unforeseen issues while maintaining a forgiving and understanding spirit. + +9. **πŸ” Reflect and Improve Together** + Regularly review team processes and suggest improvements to enhance collaboration, productivity, and growth. + +10. **πŸš€ Strive for Shared Purpose and Growth** + Align individual and team goals to ensure meaningful contributions and mutual development, fostering a sense of purpose and shared accomplishments. From a92aa2a703c7b1cbd1cb2e1e29a7e6490185af94 Mon Sep 17 00:00:00 2001 From: Derek Karungani Date: Fri, 27 Dec 2024 10:03:50 -0600 Subject: [PATCH 04/42] Fix Markdown formatting issues --- collaboration/README.md | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/collaboration/README.md b/collaboration/README.md index 749f55ab7..a64ba9cd5 100644 --- a/collaboration/README.md +++ b/collaboration/README.md @@ -9,31 +9,44 @@ We are committed to fostering a respectful, inclusive, and collaborative environ ## 🌟 Group Norms for Collaboration 1. **🌈 Foster a Safe and Inclusive Environment** - Create a supportive space where everyone feels comfortable sharing ideas, asking questions, and expressing challengesβ€”including mental health concernsβ€”without fear of judgment. + Create a supportive space where everyone feels comfortable sharing ideas, + asking questions, and expressing challengesβ€”including mental health concernsβ€” + without fear of judgment. 2. **🀝 Build and Maintain Trust** - Commit to delivering quality work, meeting deadlines, and keeping promises. Encourage openness and collaboration by sharing expertise and asking for help when needed. + Commit to delivering quality work, meeting deadlines, and keeping promises. + Encourage openness and collaboration by sharing expertise and asking for help + when needed. 3. **πŸ’‘ Resolve Issues Constructively** - Approach challenges with empathy and focus on solutions. Use open, non-confrontational communication, and involve mediation if necessary to maintain professionalism and respect. + Approach challenges with empathy and focus on solutions. Use open, + non-confrontational communication, and involve mediation if necessary to + maintain professionalism and respect. 4. **βš–οΈ Balance Collaboration and Decision-Making** - Use discussions for brainstorming and debates for decision-making, ensuring all perspectives are valued and disagreements are handled constructively. + Use discussions for brainstorming and debates for decision-making, ensuring + all perspectives are valued and disagreements are handled constructively. 5. **⏰ Respect Each Member’s Time** - Plan meetings only when essential, provide agendas in advance, and use shared tools to accommodate schedules and streamline communication. + Plan meetings only when essential, provide agendas in advance, and use shared + tools to accommodate schedules and streamline communication. 6. **πŸ“’ Ensure Transparent Communication** - Use appropriate channels for updates, technical discussions, and decision-making. Strive for clarity and accessibility in all exchanges. + Use appropriate channels for updates, technical discussions, and decision- + making. Strive for clarity and accessibility in all exchanges. 7. **πŸŽ‰ Celebrate Contributions and Milestones** - Recognize and celebrate team achievements to foster a positive and motivating atmosphere. + Recognize and celebrate team achievements to foster a positive and motivating + atmosphere. 8. **πŸ”„ Adapt and Support Flexibility** - Be adaptable to personal challenges or unforeseen issues while maintaining a forgiving and understanding spirit. + Be adaptable to personal challenges or unforeseen issues while maintaining a + forgiving and understanding spirit. 9. **πŸ” Reflect and Improve Together** - Regularly review team processes and suggest improvements to enhance collaboration, productivity, and growth. + Regularly review team processes and suggest improvements to enhance + collaboration, productivity, and growth. 10. **πŸš€ Strive for Shared Purpose and Growth** - Align individual and team goals to ensure meaningful contributions and mutual development, fostering a sense of purpose and shared accomplishments. + Align individual and team goals to ensure meaningful contributions and mutual + development, fostering a sense of purpose and shared accomplishments. From 0e9bd930d592f97fc87ed410ceced02ca3e4561a Mon Sep 17 00:00:00 2001 From: Derek Karungani Date: Fri, 27 Dec 2024 10:08:50 -0600 Subject: [PATCH 05/42] Fix Markdown formatting issues --- collaboration/README.md | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/collaboration/README.md b/collaboration/README.md index a64ba9cd5..cc0a7fb41 100644 --- a/collaboration/README.md +++ b/collaboration/README.md @@ -10,43 +10,43 @@ We are committed to fostering a respectful, inclusive, and collaborative environ 1. **🌈 Foster a Safe and Inclusive Environment** Create a supportive space where everyone feels comfortable sharing ideas, - asking questions, and expressing challengesβ€”including mental health concernsβ€” - without fear of judgment. + asking questions, and expressing challengesβ€”including mental health concerns. + Ensure this is done without fear of judgment. 2. **🀝 Build and Maintain Trust** Commit to delivering quality work, meeting deadlines, and keeping promises. - Encourage openness and collaboration by sharing expertise and asking for help - when needed. + Encourage openness and collaboration by sharing expertise and asking for + help when needed. 3. **πŸ’‘ Resolve Issues Constructively** Approach challenges with empathy and focus on solutions. Use open, - non-confrontational communication, and involve mediation if necessary to - maintain professionalism and respect. + non-confrontational communication, and involve mediation if necessary. + Maintain professionalism and respect at all times. 4. **βš–οΈ Balance Collaboration and Decision-Making** - Use discussions for brainstorming and debates for decision-making, ensuring - all perspectives are valued and disagreements are handled constructively. + Use discussions for brainstorming and debates for decision-making. Ensure all + perspectives are valued and disagreements are handled constructively. 5. **⏰ Respect Each Member’s Time** - Plan meetings only when essential, provide agendas in advance, and use shared - tools to accommodate schedules and streamline communication. + Plan meetings only when essential and provide agendas in advance. Use shared + tools to accommodate schedules and streamline communication. 6. **πŸ“’ Ensure Transparent Communication** - Use appropriate channels for updates, technical discussions, and decision- - making. Strive for clarity and accessibility in all exchanges. + Use appropriate channels for updates, technical discussions, and decisions. + Strive for clarity and accessibility in all exchanges. 7. **πŸŽ‰ Celebrate Contributions and Milestones** - Recognize and celebrate team achievements to foster a positive and motivating - atmosphere. + Recognize and celebrate team achievements. Foster a positive and motivating + atmosphere for all members. 8. **πŸ”„ Adapt and Support Flexibility** - Be adaptable to personal challenges or unforeseen issues while maintaining a - forgiving and understanding spirit. + Be adaptable to personal challenges or unforeseen issues. Maintain a + forgiving and understanding spirit throughout. 9. **πŸ” Reflect and Improve Together** - Regularly review team processes and suggest improvements to enhance - collaboration, productivity, and growth. + Regularly review team processes and suggest improvements. This helps enhance + collaboration, productivity, and growth. 10. **πŸš€ Strive for Shared Purpose and Growth** - Align individual and team goals to ensure meaningful contributions and mutual - development, fostering a sense of purpose and shared accomplishments. + Align individual and team goals to ensure meaningful contributions. Foster + mutual development, a sense of purpose, and shared accomplishments. From 23920a18b12264b4d51fefdf96535df74dcf42f1 Mon Sep 17 00:00:00 2001 From: Derek Karungani Date: Fri, 27 Dec 2024 10:16:21 -0600 Subject: [PATCH 06/42] Fix Markdown formatting issues --- collaboration/README.md | 56 +++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 24 deletions(-) diff --git a/collaboration/README.md b/collaboration/README.md index cc0a7fb41..2b95cb488 100644 --- a/collaboration/README.md +++ b/collaboration/README.md @@ -2,51 +2,59 @@ -We are committed to fostering a respectful, inclusive, and collaborative environment that values trust, open communication, and mutual support. These norms will guide our interactions and help us achieve our shared goals while accommodating individual differences and challenges. By adhering to these principles, we aim to create a team culture that drives success and personal growth. +We are committed to fostering a respectful, inclusive, and +collaborative environment that values trust, open communication, +and mutual support. These norms will guide our interactions and +help us achieve our shared goals while accommodating individual +differences and challenges. By adhering to these principles, we +aim to create a team culture that drives success and personal +growth. . ## 🌟 Group Norms for Collaboration 1. **🌈 Foster a Safe and Inclusive Environment** - Create a supportive space where everyone feels comfortable sharing ideas, - asking questions, and expressing challengesβ€”including mental health concerns. - Ensure this is done without fear of judgment. + Create a supportive space where everyone feels comfortable + sharing ideas, asking questions, and expressing challenges. + Include mental health concerns without fear of judgment. 2. **🀝 Build and Maintain Trust** - Commit to delivering quality work, meeting deadlines, and keeping promises. - Encourage openness and collaboration by sharing expertise and asking for - help when needed. + Commit to delivering quality work, meeting deadlines, and + keeping promises. Encourage openness and collaboration by + sharing expertise and asking for help when needed. 3. **πŸ’‘ Resolve Issues Constructively** - Approach challenges with empathy and focus on solutions. Use open, - non-confrontational communication, and involve mediation if necessary. - Maintain professionalism and respect at all times. + Approach challenges with empathy and focus on solutions. Use + open, non-confrontational communication. Involve mediation + if necessary to maintain professionalism and respect. 4. **βš–οΈ Balance Collaboration and Decision-Making** - Use discussions for brainstorming and debates for decision-making. Ensure all - perspectives are valued and disagreements are handled constructively. + Use discussions for brainstorming and debates for decisions. + Ensure all perspectives are valued, and disagreements are + handled constructively. 5. **⏰ Respect Each Member’s Time** - Plan meetings only when essential and provide agendas in advance. Use shared - tools to accommodate schedules and streamline communication. + Plan meetings only when essential and provide agendas early. + Use shared tools to accommodate schedules and streamline + communication. 6. **πŸ“’ Ensure Transparent Communication** - Use appropriate channels for updates, technical discussions, and decisions. - Strive for clarity and accessibility in all exchanges. + Use appropriate channels for updates, discussions, and + decisions. Strive for clarity and accessibility in all exchanges. 7. **πŸŽ‰ Celebrate Contributions and Milestones** - Recognize and celebrate team achievements. Foster a positive and motivating - atmosphere for all members. + Recognize and celebrate team achievements. Foster a positive + and motivating atmosphere for all members. 8. **πŸ”„ Adapt and Support Flexibility** - Be adaptable to personal challenges or unforeseen issues. Maintain a - forgiving and understanding spirit throughout. + Be adaptable to personal challenges or unforeseen issues. + Maintain a forgiving and understanding spirit. 9. **πŸ” Reflect and Improve Together** - Regularly review team processes and suggest improvements. This helps enhance - collaboration, productivity, and growth. + Regularly review team processes and suggest improvements to + enhance collaboration, productivity, and growth. 10. **πŸš€ Strive for Shared Purpose and Growth** - Align individual and team goals to ensure meaningful contributions. Foster - mutual development, a sense of purpose, and shared accomplishments. + Align individual and team goals to ensure meaningful work. + Foster development, purpose, and shared accomplishments. From c44f17f943d718b03b38fd2ac174f694d99fe5ae Mon Sep 17 00:00:00 2001 From: Tibyan Khalid Date: Fri, 27 Dec 2024 20:05:36 +0200 Subject: [PATCH 07/42] I have made some changes in emojis, and added more details in the communication guidelines --- collaboration/README.md | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/collaboration/README.md b/collaboration/README.md index 2b95cb488..1b5cf691c 100644 --- a/collaboration/README.md +++ b/collaboration/README.md @@ -1,4 +1,4 @@ -# Collaboration +# 🌟Our Group Norms🌟 @@ -10,51 +10,59 @@ differences and challenges. By adhering to these principles, we aim to create a team culture that drives success and personal growth. - . + -## 🌟 Group Norms for Collaboration +## πŸ“‹ Group Norms for Collaboration -1. **🌈 Foster a Safe and Inclusive Environment** + **πŸ’Œ Foster a Safe and Inclusive Environment** Create a supportive space where everyone feels comfortable sharing ideas, asking questions, and expressing challenges. Include mental health concerns without fear of judgment. -2. **🀝 Build and Maintain Trust** + **🀝 Build and Maintain Trust** Commit to delivering quality work, meeting deadlines, and keeping promises. Encourage openness and collaboration by sharing expertise and asking for help when needed. -3. **πŸ’‘ Resolve Issues Constructively** + **πŸ’‘ Resolve Issues Constructively** Approach challenges with empathy and focus on solutions. Use open, non-confrontational communication. Involve mediation if necessary to maintain professionalism and respect. -4. **βš–οΈ Balance Collaboration and Decision-Making** + **βš–οΈ Balance Collaboration and Decision-Making** Use discussions for brainstorming and debates for decisions. Ensure all perspectives are valued, and disagreements are handled constructively. -5. **⏰ Respect Each Member’s Time** + **⏰ Respect Each Member’s Time** Plan meetings only when essential and provide agendas early. - Use shared tools to accommodate schedules and streamline + Use a shared calender to accommodate schedules and streamline communication. -6. **πŸ“’ Ensure Transparent Communication** + **πŸ“’ Ensure Transparent Communication** Use appropriate channels for updates, discussions, and - decisions. Strive for clarity and accessibility in all exchanges. + decisions. +* Discussions and Progress Tracking: GitHub Issues, Pull Requests, and the project board. -7. **πŸŽ‰ Celebrate Contributions and Milestones** +* Quick Updates : Slack. + +* Planning and Documentation: Shared Google Docs. + +* Synchronous Meetings: Zoom for discussions or decision-making. + + + **πŸŽ‰ Celebrate Contributions and Milestones** Recognize and celebrate team achievements. Foster a positive and motivating atmosphere for all members. -8. **πŸ”„ Adapt and Support Flexibility** + **πŸ”„ Adapt and Support Flexibility** Be adaptable to personal challenges or unforeseen issues. Maintain a forgiving and understanding spirit. -9. **πŸ” Reflect and Improve Together** + **πŸ” Reflect and Improve Together** Regularly review team processes and suggest improvements to enhance collaboration, productivity, and growth. -10. **πŸš€ Strive for Shared Purpose and Growth** + **πŸš€ Strive for Shared Purpose and Growth** Align individual and team goals to ensure meaningful work. Foster development, purpose, and shared accomplishments. From 2104e4d5174236d6428977ba3a4975fe270706c3 Mon Sep 17 00:00:00 2001 From: Tibyan Khalid Date: Fri, 27 Dec 2024 20:21:28 +0200 Subject: [PATCH 08/42] Minor change to escape the md formatting error. --- collaboration/README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/collaboration/README.md b/collaboration/README.md index 1b5cf691c..39db606f3 100644 --- a/collaboration/README.md +++ b/collaboration/README.md @@ -42,7 +42,9 @@ growth. **πŸ“’ Ensure Transparent Communication** Use appropriate channels for updates, discussions, and decisions. -* Discussions and Progress Tracking: GitHub Issues, Pull Requests, and the project board. +* Discussions and Progress Tracking: + + GitHub Issues, Pull Requests, and the project board. * Quick Updates : Slack. From 20de1b523bf217b9274df2975af80e1748079826 Mon Sep 17 00:00:00 2001 From: Tibyan Khalid Date: Fri, 27 Dec 2024 20:28:01 +0200 Subject: [PATCH 09/42] Added some punctuations --- collaboration/README.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/collaboration/README.md b/collaboration/README.md index 39db606f3..9fc70b77f 100644 --- a/collaboration/README.md +++ b/collaboration/README.md @@ -12,7 +12,7 @@ growth. -## πŸ“‹ Group Norms for Collaboration +## πŸ“‹ Group Norms for Collaboration: **πŸ’Œ Foster a Safe and Inclusive Environment** Create a supportive space where everyone feels comfortable @@ -39,14 +39,12 @@ growth. Use a shared calender to accommodate schedules and streamline communication. - **πŸ“’ Ensure Transparent Communication** - Use appropriate channels for updates, discussions, and - decisions. + **πŸ“’ Ensure Transparent Communication** * Discussions and Progress Tracking: - GitHub Issues, Pull Requests, and the project board. + GitHub Issues, Pull Requests, project board. -* Quick Updates : Slack. +* Quick Updates: Slack. * Planning and Documentation: Shared Google Docs. From 9232200490f63def2837dac7a4f3796ff229ddc8 Mon Sep 17 00:00:00 2001 From: Tibyan Khalid Date: Fri, 27 Dec 2024 20:34:37 +0200 Subject: [PATCH 10/42] Edits for the md formatting checks --- collaboration/README.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/collaboration/README.md b/collaboration/README.md index 9fc70b77f..d48f67d1b 100644 --- a/collaboration/README.md +++ b/collaboration/README.md @@ -12,7 +12,7 @@ growth. -## πŸ“‹ Group Norms for Collaboration: +## πŸ“‹ Group Norms for Collaboration **πŸ’Œ Foster a Safe and Inclusive Environment** Create a supportive space where everyone feels comfortable @@ -39,10 +39,9 @@ growth. Use a shared calender to accommodate schedules and streamline communication. - **πŸ“’ Ensure Transparent Communication** -* Discussions and Progress Tracking: + **πŸ“’ Ensure Transparent Communication** - GitHub Issues, Pull Requests, project board. +* Discussions and Progress Tracking: GitHub Issues, Pull Requests, project board. * Quick Updates: Slack. @@ -50,7 +49,6 @@ growth. * Synchronous Meetings: Zoom for discussions or decision-making. - **πŸŽ‰ Celebrate Contributions and Milestones** Recognize and celebrate team achievements. Foster a positive and motivating atmosphere for all members. From 61a9d653152ff2f81b2b60c04b08f8f37ffc9c42 Mon Sep 17 00:00:00 2001 From: Tibyan Khalid Date: Fri, 27 Dec 2024 20:51:32 +0200 Subject: [PATCH 11/42] Some edits for md formatting error --- collaboration/README.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/collaboration/README.md b/collaboration/README.md index d48f67d1b..c4bab199f 100644 --- a/collaboration/README.md +++ b/collaboration/README.md @@ -39,15 +39,14 @@ growth. Use a shared calender to accommodate schedules and streamline communication. - **πŸ“’ Ensure Transparent Communication** +**πŸ“’ Ensure Transparent Communication** + Discussions and Progress Tracking: GitHub Issues, Pull Requests, project board. -* Discussions and Progress Tracking: GitHub Issues, Pull Requests, project board. + Quick Updates: Slack. -* Quick Updates: Slack. + Planning and Documentation: Shared Google Docs. -* Planning and Documentation: Shared Google Docs. - -* Synchronous Meetings: Zoom for discussions or decision-making. + Synchronous Meetings: Zoom for discussions or decision-making. **πŸŽ‰ Celebrate Contributions and Milestones** Recognize and celebrate team achievements. Foster a positive From ceccb80a10787b18de2ea923e47e9abf2ea771d6 Mon Sep 17 00:00:00 2001 From: Frank2446-dotcom Date: Sat, 28 Dec 2024 10:39:00 +0300 Subject: [PATCH 12/42] Added communication.md in the collaboration folder --- collaboration/communication.md | 108 ++++++++++++++++++++++----------- 1 file changed, 73 insertions(+), 35 deletions(-) diff --git a/collaboration/communication.md b/collaboration/communication.md index 484652e0f..6988b2868 100644 --- a/collaboration/communication.md +++ b/collaboration/communication.md @@ -1,54 +1,92 @@ - - # Communication ______________________________________________________________________ ## Communication Schedule -| Day | How | The topic of discussion | | --- | :-: | ----------------------- | -| | | | +| **Day** | **How** | **Topic of Discussion** | +|----------------|----------------------|-------------------------------------| +| Friday/Sunday | Video call (Zoom) | Update on progress | +| Everyday | Slack | Quick questions, announcements | -## Communication Channels +______________________________________________________________________ -how often will we get in touch on each channel, and what we will discuss there: +## Communication Channels -- **Issues**: -- **Pull Requests**: -- **Slack/Discord**: -- **Video Calls**: +**How often will we get in touch on each channel, and what we will discuss there:** + +- **Issues**: + - **Frequency**: Daily or as new issues arise. + - **Topics Discussed**: + - Bugs and their resolution. + - Feature requests or enhancements. + - Documentation or knowledge gaps. + - General project-related discussions requiring tracking. + +- **Pull Requests**: + - **Frequency**: As needed when code changes are ready for review. + - **Topics Discussed**: + - Code review and feedback. + - Suggestions for improvement or refactoring. + - Discussions on implementation details. + - Final approvals and merging criteria. + +- **Slack/Discord**: + - **Frequency**: Continuously throughout the workday. + - **Topics Discussed**: + - Quick questions or clarifications. + - Updates on progress or blockers. + - Sharing resources, links, or relevant information. + - Informal discussions or team bonding in designated channels. + +- **Video Calls**: + - **Frequency**: Weekly or bi-weekly, or as needed for critical discussions. + - **Topics Discussed**: + - Project planning and roadmap alignment. + - Sprint retrospectives or reviews. + - Deep-dive discussions on complex issues. + - Conflict resolution and decision-making. ______________________________________________________________________ ## Availability -### Availability for calling/messaging +### Availability for Calling/Messaging + +| **Day** | **Monday** | **Tuesday** | **Wednesday** | **Thursday** | **Friday** | **Saturday** | **Sunday** | +|--------------|:----------:|:-----------:|:-------------:|:------------:|:----------:|:------------:|:----------:| +| Derek | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | +| Safaa | Yes | Yes | Yes | No | No | No | No | +| Frankline | 9:00-11:00 | 9:00-11:00 | 9:00-11:00 | 9:00-11:00 | 9:00-11:00 | Unavailable | Unavailable| +| Tibyan | Unavailable| Available | Unavailable | Unavailable | Available | Available | Available | +| Azza | 4:00-6:00 | 4:00-12:00 | 4:00-12:00 | Unavailable | Unavailable| 12:00-14:00 | 4:00-12:00 | +| Kareiman | 12:00-19:00| 12:00-19:00 | 12:00-19:00 | 12:00-19:00 | 8:00-11:00 | 8:00-12:00 | 12:00-19:00| +| Eman | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | +| Shima | 11:00-1:00 | Unavailable | 11:00-1:00 | 11:00-1:00 | 11:00-1:00 | 11:00-1:00 | Unavailable| + +--- + +### Hours Available Per Day + +| **Days/Name** | **Monday** | **Tuesday** | **Wednesday** | **Thursday** | **Friday** | **Saturday** | **Sunday** | +|---------------|------------|-------------|---------------|--------------|------------|--------------|------------| +| Ambetsa | 2 hours | 2 hours | 2 hours | 2 hours | 2 hours | Unavailable | Unavailable| +| Derek | 2 hours | 2 hours | 2 hours | 2 hours | 2 hours | 2 hours | 2 hours | +| Safaa | 2 hours | 2 hours | 2 hours | Unavailable | Unavailable| 2 hours | 2 hours | +| Shima | 2 hours | Unavailable | 3 hours | 3 hours | 3 hours | 3 hours | Unavailable| +| Tibyan | 1 hour | 6 hours | 1 hour | 1 hour | 6 hours | 6 hours | 6 hours | +| Azza | 2 hours | 7 hours | 7 hours | Unavailable | Unavailable| 2 hours | 7 hours | +| Kareiman | 6 hours | 6 hours | 6 hours | 6 hours | 3 hours | 4 hours | 4 hours | +| Eman | 2 hours | 2 hours | 2 hours | 2 hours | 2 hours | 3 hours | 3 hours | -| Day | Monday | Tuesday | Wednesday | Thursday | Friday | Saturday | Sunday | | ------- | :----: | :-----: | :-------: | :------: | :----: | :------: | :----: | -| _name_ | | | | | | | | - -### How many hours everyone has per day - -- name: _5h_; -- name: _6h_; -- name: _5h_; -- name: _4h_; -- name: _3h_; +______________________________________________________________________ ## Asking for Help -There's a fine line between confidently learning from your mistakes, and -stubbornly getting no where. Here is a general guide for when to ask for help -based on how long you've been stuck on the same problem: +Here’s a guideline for when to ask for help based on how long you’ve been stuck: + +1. **0-30 minutes**: Try solving the issue independently. +2. **30-60 minutes**: Reach out to your group for help. +3. **60+ minutes**: Tag your coaches on Slack or GitHub for assistance. -1. _0 -> 30 min_: Try on your own -1. _30 -> 60 min_: Ask your group for help -1. _60+ min_: Tag your coaches in Slack or GitHub +--- From a2e86561845ebe57f0998fcfd812876db033888f Mon Sep 17 00:00:00 2001 From: "Kareeiman K." Date: Sat, 28 Dec 2024 16:17:23 +0400 Subject: [PATCH 13/42] Initial commit --- .vscode/settings.json | 5 ++- collaboration/constraints.md | 67 +++++++++++++++++++----------------- 2 files changed, 39 insertions(+), 33 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 5a90e202f..e3cd76d7c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -113,5 +113,8 @@ }, // Enable/disable update table of contents on save - "markdown.extension.toc.updateOnSave": false + "markdown.extension.toc.updateOnSave": false, + "githubPullRequests.ignoredPullRequestBranches": [ + "main" + ] } diff --git a/collaboration/constraints.md b/collaboration/constraints.md index 24079505c..8e962d3f4 100644 --- a/collaboration/constraints.md +++ b/collaboration/constraints.md @@ -1,34 +1,37 @@ - - # Constraints -Some boundaries around our project. - -## External - - - -## Internal: Involuntary - - - -## Internal: Voluntary - - +To ensure efficiency and balanced contributions, the project should have clear boundaries. +Roles and responsibilities should be well-defined to prevent overlapping efforts, +with expectations set for balanced contributions considering each member’s constraints. + +A culture of constructive feedback and solution-focused discussions should be established, +with a clear process in place for resolving conflicts. +These boundaries aim to create a productive and supportive environment for the team. + +## External Constraints + +The team faces several external constraints impacting collaboration. +Remote work across different timezones can be challenging. +Limited or unstable internet access complicates communication and online collaboration. +Some team members are constrained by family and work responsibilities, +while others face time limitations due to university final exams. + +## Internal Involuntary Constraints + +The team faces several internal involuntary constraints that affect their progress. +Many members lack prior knowledge or experience with Git and GitHub. +Limited technical expertise, combined with the new skills required are constraining. +Balancing professional commitments and personal responsibilities, limits availability. +These factors create hurdles in both skill development and team collaboration. + +## Internal Voluntary Constraints + +Members commit to providing daily progress updates and adhering to group norms. +There is a collective agreement to focus on medium-level coding challenges +that match everyone’s skill level, +allowing for skill development while gaining confidence in using Git and GitHub. +Balancing project work with other commitments is emphasized, +along with maintaining discipline in following the project plan. +To accommodate time constraints and differing availability, the team prioritizes +asynchronous communication methods, such as using GitHub issues and pull requests. +These guidelines aim to promote effective teamwork and steady progress. From ba172e36f821910b72d0ab3d106956fa3d3d80a4 Mon Sep 17 00:00:00 2001 From: Frank2446-dotcom Date: Sat, 28 Dec 2024 16:17:16 +0300 Subject: [PATCH 14/42] Added communication.md in the collaboration folder --- collaboration/communication.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/collaboration/communication.md b/collaboration/communication.md index 6988b2868..0fa4ccdbb 100644 --- a/collaboration/communication.md +++ b/collaboration/communication.md @@ -6,7 +6,7 @@ ______________________________________________________________________ | **Day** | **How** | **Topic of Discussion** | |----------------|----------------------|-------------------------------------| -| Friday/Sunday | Video call (Zoom) | Update on progress | +| Friday/Sunday | Video call (Zoom) | Update on progress/ complex discussions/ decision-making | | Everyday | Slack | Quick questions, announcements | ______________________________________________________________________ @@ -55,14 +55,14 @@ ______________________________________________________________________ | **Day** | **Monday** | **Tuesday** | **Wednesday** | **Thursday** | **Friday** | **Saturday** | **Sunday** | |--------------|:----------:|:-----------:|:-------------:|:------------:|:----------:|:------------:|:----------:| -| Derek | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | -| Safaa | Yes | Yes | Yes | No | No | No | No | -| Frankline | 9:00-11:00 | 9:00-11:00 | 9:00-11:00 | 9:00-11:00 | 9:00-11:00 | Unavailable | Unavailable| -| Tibyan | Unavailable| Available | Unavailable | Unavailable | Available | Available | Available | -| Azza | 4:00-6:00 | 4:00-12:00 | 4:00-12:00 | Unavailable | Unavailable| 12:00-14:00 | 4:00-12:00 | -| Kareiman | 12:00-19:00| 12:00-19:00 | 12:00-19:00 | 12:00-19:00 | 8:00-11:00 | 8:00-12:00 | 12:00-19:00| -| Eman | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | -| Shima | 11:00-1:00 | Unavailable | 11:00-1:00 | 11:00-1:00 | 11:00-1:00 | 11:00-1:00 | Unavailable| +| Derek | Yes | Yes | Yes | Yes | Yes | Yes | Yes | +| Safaa | Yes|Yes|Yes|No|No|No|No| +| Frankline | Yes | Yes | Yes | Yes | Yes | No | No| +| Tibyan | No| Yes | No | No | Yes | Yes | Yes | +| Azza | Yes | Yes | Yes | No | No| Yes | Yes | +| Kareiman | Yes| Yes | Yes | Yes | Yes | Yes | Yes| +| Eman | Yes | Yes | Yes | Yes | Yes | Yes | Yes | +| Shima | Yes | No | Yes | Yes | Yes | Yes | No| --- From aafe1e773f9ff315ddfe27c413af2bf48319926e Mon Sep 17 00:00:00 2001 From: Frank2446-dotcom Date: Sat, 28 Dec 2024 16:32:52 +0300 Subject: [PATCH 15/42] Added communication.md in the collaboration folder --- collaboration/communication.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/collaboration/communication.md b/collaboration/communication.md index 0fa4ccdbb..671518049 100644 --- a/collaboration/communication.md +++ b/collaboration/communication.md @@ -6,7 +6,7 @@ ______________________________________________________________________ | **Day** | **How** | **Topic of Discussion** | |----------------|----------------------|-------------------------------------| -| Friday/Sunday | Video call (Zoom) | Update on progress/ complex discussions/ decision-making | +| Friday/Sunday | Video call (Zoom) | Update on progress/ complex discussions/ decision-making | | Everyday | Slack | Quick questions, announcements | ______________________________________________________________________ @@ -55,14 +55,14 @@ ______________________________________________________________________ | **Day** | **Monday** | **Tuesday** | **Wednesday** | **Thursday** | **Friday** | **Saturday** | **Sunday** | |--------------|:----------:|:-----------:|:-------------:|:------------:|:----------:|:------------:|:----------:| -| Derek | Yes | Yes | Yes | Yes | Yes | Yes | Yes | -| Safaa | Yes|Yes|Yes|No|No|No|No| -| Frankline | Yes | Yes | Yes | Yes | Yes | No | No| -| Tibyan | No| Yes | No | No | Yes | Yes | Yes | -| Azza | Yes | Yes | Yes | No | No| Yes | Yes | -| Kareiman | Yes| Yes | Yes | Yes | Yes | Yes | Yes| -| Eman | Yes | Yes | Yes | Yes | Yes | Yes | Yes | -| Shima | Yes | No | Yes | Yes | Yes | Yes | No| +| Derek | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | +| Safaa | Available | Available | Available | Unavailable | Unavailable| Unavailable | Unavailable| +| Frankline | 9:00-11:00 | 9:00-11:00 | 9:00-11:00 | 9:00-11:00 | 9:00-11:00 | Unavailable | Unavailable| +| Tibyan | Unavailable| Available | Unavailable | Unavailable | Available | Available | Available | +| Azza | 4:00-6:00 | 4:00-12:00 | 4:00-12:00 | Unavailable | Unavailable| 12:00-14:00 | 4:00-12:00 | +| Kareiman | 12:00-19:00| 12:00-19:00 | 12:00-19:00 | 12:00-19:00 | 8:00-11:00 | 8:00-12:00 | 12:00-19:00| +| Eman | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | +| Shima | 11:00-1:00 | Unavailable | 11:00-1:00 | 11:00-1:00 | 11:00-1:00 | 11:00-1:00 | Unavailable| --- From 3584d525c9b5a048c7b1f67f01d6c82d024b7803 Mon Sep 17 00:00:00 2001 From: "Kareeiman K." Date: Sat, 28 Dec 2024 19:34:04 +0400 Subject: [PATCH 16/42] constraints.md --- collaboration/constraints.md | 103 ++++++++++++++++++++++------------- 1 file changed, 66 insertions(+), 37 deletions(-) diff --git a/collaboration/constraints.md b/collaboration/constraints.md index 8e962d3f4..0a91f4195 100644 --- a/collaboration/constraints.md +++ b/collaboration/constraints.md @@ -1,37 +1,66 @@ -# Constraints - -To ensure efficiency and balanced contributions, the project should have clear boundaries. -Roles and responsibilities should be well-defined to prevent overlapping efforts, -with expectations set for balanced contributions considering each member’s constraints. - -A culture of constructive feedback and solution-focused discussions should be established, -with a clear process in place for resolving conflicts. -These boundaries aim to create a productive and supportive environment for the team. - -## External Constraints - -The team faces several external constraints impacting collaboration. -Remote work across different timezones can be challenging. -Limited or unstable internet access complicates communication and online collaboration. -Some team members are constrained by family and work responsibilities, -while others face time limitations due to university final exams. - -## Internal Involuntary Constraints - -The team faces several internal involuntary constraints that affect their progress. -Many members lack prior knowledge or experience with Git and GitHub. -Limited technical expertise, combined with the new skills required are constraining. -Balancing professional commitments and personal responsibilities, limits availability. -These factors create hurdles in both skill development and team collaboration. - -## Internal Voluntary Constraints - -Members commit to providing daily progress updates and adhering to group norms. -There is a collective agreement to focus on medium-level coding challenges -that match everyone’s skill level, -allowing for skill development while gaining confidence in using Git and GitHub. -Balancing project work with other commitments is emphasized, -along with maintaining discipline in following the project plan. -To accommodate time constraints and differing availability, the team prioritizes -asynchronous communication methods, such as using GitHub issues and pull requests. -These guidelines aim to promote effective teamwork and steady progress. +# βš™οΈ **Project Boundaries & Constraints** + +## 🚧 **Clear Boundaries for Efficiency** + +To ensure efficiency and balanced contributions, the project + should have **clear boundaries**. + +- Roles and responsibilities should be **well-defined** to prevent + overlapping efforts. +- Expectations should be set for **balanced contributions**, considering + each member’s **constraints**. +- A **culture of constructive feedback** and solution-focused discussions should + be established. +- A **clear process** for resolving conflicts is essential. + +These boundaries aim to create a **productive** and + **supportive environment** for the team. +🌱 + +--- + +## 🌍 **External Constraints** + +The team faces several **external constraints** impacting collaboration: + +- **🌍 Timezones**: Remote work across different timezones can be challenging. +- **🌐 Internet Access**: Limited or unstable internet access complicates communication + and online collaboration. +- **πŸ‘¨β€πŸ‘©β€πŸ‘§β€πŸ‘¦ Family & Work**: Some members are constrained by family + and work responsibilities. +- **πŸ“š Academic Commitments**: Others face time limitations due + to university final exams. + +--- + +## βš™οΈ **Internal Involuntary Constraints** + +The team faces several **internal involuntary constraints** that affect their progress: + +- **πŸ“‚ Git & GitHub Knowledge**: Many members lack prior knowledge or experience +with Git and GitHub. +- **πŸ› οΈ Technical Expertise**: Limited technical expertise, combined with + new skills required, is a challenge to the team members. +- **⏳ Time Availability**: Balancing professional commitments and personal + responsibilities limits availability. + +These factors create hurdles in both **skill development** and **team collaboration**. +πŸ’‘ + +--- + +## πŸ› οΈ **Internal Voluntary Constraints** + +Members commit to the following **voluntary constraints** to ensure steady progress: + +- **πŸ“ Daily Progress Updates**: Members will provide daily updates on their progress. +- **πŸ’» Medium-level Coding Challenges**: Focus on coding challenges that + match everyone’s skill level to promote learning. +- **βš–οΈ Balancing Commitments**: Prioritizing a balance between project work + and other commitments. +- **πŸ“¬ Asynchronous Communication**: Emphasis on using asynchronous methods like + GitHub issues and pull requests. + +These guidelines aim to foster effective teamwork, **skill development**, + and steady project progress. +🌟 From 3a4d54c01676c0f8077f08a9d7014c55cdbcc63e Mon Sep 17 00:00:00 2001 From: "Kareeiman K." Date: Sat, 28 Dec 2024 19:58:32 +0400 Subject: [PATCH 17/42] contraints updates --- collaboration/constraints.md | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/collaboration/constraints.md b/collaboration/constraints.md index 0a91f4195..ec0c2e156 100644 --- a/collaboration/constraints.md +++ b/collaboration/constraints.md @@ -3,21 +3,18 @@ ## 🚧 **Clear Boundaries for Efficiency** To ensure efficiency and balanced contributions, the project - should have **clear boundaries**. + should have **clear boundaries**. - Roles and responsibilities should be **well-defined** to prevent - overlapping efforts. + overlapping efforts. - Expectations should be set for **balanced contributions**, considering - each member’s **constraints**. + each member’s **constraints**. - A **culture of constructive feedback** and solution-focused discussions should - be established. -- A **clear process** for resolving conflicts is essential. + be established. +- A **clear process** for resolving conflicts is essential. These boundaries aim to create a **productive** and - **supportive environment** for the team. -🌱 - ---- + **supportive environment** for the team. ## 🌍 **External Constraints** @@ -29,7 +26,7 @@ The team faces several **external constraints** impacting collaboration: - **πŸ‘¨β€πŸ‘©β€πŸ‘§β€πŸ‘¦ Family & Work**: Some members are constrained by family and work responsibilities. - **πŸ“š Academic Commitments**: Others face time limitations due - to university final exams. + to university final exams. --- @@ -42,10 +39,9 @@ with Git and GitHub. - **πŸ› οΈ Technical Expertise**: Limited technical expertise, combined with new skills required, is a challenge to the team members. - **⏳ Time Availability**: Balancing professional commitments and personal - responsibilities limits availability. + responsibilities limits availability. These factors create hurdles in both **skill development** and **team collaboration**. -πŸ’‘ --- @@ -62,5 +58,4 @@ Members commit to the following **voluntary constraints** to ensure steady progr GitHub issues and pull requests. These guidelines aim to foster effective teamwork, **skill development**, - and steady project progress. -🌟 + and steady project progress.🌟 From 5f64d5e2539a19d4ea1bb9f9534e58ca35248d8f Mon Sep 17 00:00:00 2001 From: "Kareeiman K." Date: Sat, 28 Dec 2024 20:07:06 +0400 Subject: [PATCH 18/42] contraints update --- collaboration/constraints.md | 68 +++++++++++++++++++----------------- 1 file changed, 36 insertions(+), 32 deletions(-) diff --git a/collaboration/constraints.md b/collaboration/constraints.md index ec0c2e156..1494cd480 100644 --- a/collaboration/constraints.md +++ b/collaboration/constraints.md @@ -2,60 +2,64 @@ ## 🚧 **Clear Boundaries for Efficiency** -To ensure efficiency and balanced contributions, the project - should have **clear boundaries**. +To ensure efficiency and balanced contributions, the project should have +**clear boundaries**. -- Roles and responsibilities should be **well-defined** to prevent - overlapping efforts. -- Expectations should be set for **balanced contributions**, considering - each member’s **constraints**. +- Roles and responsibilities should be **well-defined** to prevent overlapping + efforts. +- Expectations should be set for **balanced contributions**, considering each + member’s **constraints**. - A **culture of constructive feedback** and solution-focused discussions should be established. - A **clear process** for resolving conflicts is essential. -These boundaries aim to create a **productive** and - **supportive environment** for the team. +These boundaries aim to create a **productive** and **supportive environment** +for the team. ## 🌍 **External Constraints** The team faces several **external constraints** impacting collaboration: -- **🌍 Timezones**: Remote work across different timezones can be challenging. -- **🌐 Internet Access**: Limited or unstable internet access complicates communication - and online collaboration. -- **πŸ‘¨β€πŸ‘©β€πŸ‘§β€πŸ‘¦ Family & Work**: Some members are constrained by family - and work responsibilities. -- **πŸ“š Academic Commitments**: Others face time limitations due - to university final exams. +- **🌍 Timezones**: Remote work across different timezones can be challenging. +- **🌐 Internet Access**: Limited or unstable internet access complicates + communication and online collaboration. +- **πŸ‘¨β€πŸ‘©β€πŸ‘§β€πŸ‘¦ Family & Work**: Some members are constrained by family and work + responsibilities. +- **πŸ“š Academic Commitments**: Others face time limitations due to university + final exams. --- ## βš™οΈ **Internal Involuntary Constraints** -The team faces several **internal involuntary constraints** that affect their progress: +The team faces several **internal involuntary constraints** that affect their +progress: - **πŸ“‚ Git & GitHub Knowledge**: Many members lack prior knowledge or experience -with Git and GitHub. -- **πŸ› οΈ Technical Expertise**: Limited technical expertise, combined with - new skills required, is a challenge to the team members. -- **⏳ Time Availability**: Balancing professional commitments and personal - responsibilities limits availability. + with Git and GitHub. +- **πŸ› οΈ Technical Expertise**: Limited technical expertise, combined with new + skills required, is a challenge to the team members. +- **⏳ Time Availability**: Balancing professional commitments and personal + responsibilities limits availability. -These factors create hurdles in both **skill development** and **team collaboration**. +These factors create hurdles in both **skill development** and **team +collaboration**. --- ## πŸ› οΈ **Internal Voluntary Constraints** -Members commit to the following **voluntary constraints** to ensure steady progress: +Members commit to the following **voluntary constraints** to ensure steady +progress: -- **πŸ“ Daily Progress Updates**: Members will provide daily updates on their progress. -- **πŸ’» Medium-level Coding Challenges**: Focus on coding challenges that - match everyone’s skill level to promote learning. -- **βš–οΈ Balancing Commitments**: Prioritizing a balance between project work - and other commitments. -- **πŸ“¬ Asynchronous Communication**: Emphasis on using asynchronous methods like - GitHub issues and pull requests. +- **πŸ“ Daily Progress Updates**: Members will provide daily updates on their + progress. +- **πŸ’» Medium-level Coding Challenges**: Focus on coding challenges that match + everyone’s skill level to promote learning. +- **βš–οΈ Balancing Commitments**: Prioritizing a balance between project work and + other commitments. +- **πŸ“¬ Asynchronous Communication**: Emphasis on using asynchronous methods + like GitHub issues and pull requests. -These guidelines aim to foster effective teamwork, **skill development**, - and steady project progress.🌟 +These guidelines aim to foster effective teamwork, **skill development**, and +steady project progress. 🌟 From 09b8988eb49af07238c5c276e0aa627a743c729e Mon Sep 17 00:00:00 2001 From: "Kareeiman K." Date: Sat, 28 Dec 2024 20:17:58 +0400 Subject: [PATCH 19/42] contraints update --- collaboration/constraints.md | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/collaboration/constraints.md b/collaboration/constraints.md index 1494cd480..a1bce8646 100644 --- a/collaboration/constraints.md +++ b/collaboration/constraints.md @@ -20,15 +20,15 @@ for the team. The team faces several **external constraints** impacting collaboration: -- **🌍 Timezones**: Remote work across different timezones can be challenging. +- **🌍 Timezones**: Remote work across different timezones can be challenging. - **🌐 Internet Access**: Limited or unstable internet access complicates - communication and online collaboration. + communication and online collaboration. - **πŸ‘¨β€πŸ‘©β€πŸ‘§β€πŸ‘¦ Family & Work**: Some members are constrained by family and work - responsibilities. + responsibilities. - **πŸ“š Academic Commitments**: Others face time limitations due to university final exams. ---- +________________________________________________________________________ ## βš™οΈ **Internal Involuntary Constraints** @@ -36,16 +36,15 @@ The team faces several **internal involuntary constraints** that affect their progress: - **πŸ“‚ Git & GitHub Knowledge**: Many members lack prior knowledge or experience - with Git and GitHub. + with Git and GitHub. - **πŸ› οΈ Technical Expertise**: Limited technical expertise, combined with new - skills required, is a challenge to the team members. + skills required, is a challenge to the team members. - **⏳ Time Availability**: Balancing professional commitments and personal - responsibilities limits availability. + responsibilities limits availability. -These factors create hurdles in both **skill development** and **team -collaboration**. +These factors create hurdles in both **skill development** and **team collaboration**. ---- +________________________________________________________________________ ## πŸ› οΈ **Internal Voluntary Constraints** @@ -53,13 +52,13 @@ Members commit to the following **voluntary constraints** to ensure steady progress: - **πŸ“ Daily Progress Updates**: Members will provide daily updates on their - progress. -- **πŸ’» Medium-level Coding Challenges**: Focus on coding challenges that match - everyone’s skill level to promote learning. -- **βš–οΈ Balancing Commitments**: Prioritizing a balance between project work and - other commitments. + progress. +- **πŸ’» Medium-level Coding Challenges**: Focus on coding challenges that + match everyone’s skill level to promote learning. +- **βš–οΈ Balancing Commitments**: Prioritizing a balance between project work + and other commitments. - **πŸ“¬ Asynchronous Communication**: Emphasis on using asynchronous methods like GitHub issues and pull requests. -These guidelines aim to foster effective teamwork, **skill development**, and -steady project progress. 🌟 +These guidelines aim to foster effective teamwork, **skill development**, and +steady project progress. From 7db6da6ba8977d6e2a4984bbc9143899c25f7847 Mon Sep 17 00:00:00 2001 From: AzzaOmer1 <103028535+AzzaOmer1@users.noreply.github.com> Date: Sat, 28 Dec 2024 22:53:24 +0300 Subject: [PATCH 20/42] added learnig goals --- collaboration/learning_goals.md | 46 +++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/collaboration/learning_goals.md b/collaboration/learning_goals.md index 11c583d2b..88d965f50 100644 --- a/collaboration/learning_goals.md +++ b/collaboration/learning_goals.md @@ -1,5 +1,47 @@ # Learning Goals -## Collective +## πŸ† Collective Objectives -## Individual +### πŸ§‘β€πŸ’» Seamless Collaboration and Version Control + +- Use Git and GitHub effectively for version control and collaboration in group projects. +- Enhance team dynamics through effective use of GitHub features like pull requests and issue tracking. +- Implement best practices for version control, code reviews, and continuous integration. + +### 🀝 Strengthen Team Collaboration and Communication + +- Build strong teamwork through mutual support, exchanging ideas, and solving problems together. +- Foster open communication and feedback to improve group performance. +- Navigate and manage conflicts in group settings to strengthen collaboration. + +### 🎯 Deliver Exceptional Outcomes + +- Maintain high standards in code quality, documentation, and achieve project milestones through collective effort. +- Participate in constructive code reviews and refine solutions collectively. + +### 🌐 Expand Professional Networks + +- Strengthen team connections for future opportunities and collaborations. +- Build relationships that support professional growth within and outside the team. + +--- + +## πŸš€ Individual Objectives + +Each team member will pursue the following professional development objectives: + +- Practice Python to improve skills, write clean and readable code, and learn from good examples. +- Explore computer science topics, focusing on debugging, testing, and unit testing. +- Apply Python in data analysis and science. + +- Learn and effectively use Git and GitHub for collaboration and group projects. +- Gain confidence in debugging with tools like pdb,the VSCode debugger, and the trace module. + +- Work well in groups, exchange ideas, and improve through feedback and code reviews. +- Build connections and improve communication skills. + +- Practice coding, documenting, testing, and debugging by solving challenges. + +- Practice writing Python code using new language features. +- Explore academic topics and non-academic skills to build diverse expertise. + \ No newline at end of file From b1383b418cc3e0f50cde4d7b0a4018820848b9fc Mon Sep 17 00:00:00 2001 From: AzzaOmer1 <103028535+AzzaOmer1@users.noreply.github.com> Date: Sat, 28 Dec 2024 23:41:46 +0300 Subject: [PATCH 21/42] edit formatting learnig goals --- collaboration/learning_goals.md | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/collaboration/learning_goals.md b/collaboration/learning_goals.md index 88d965f50..c1f3f8a83 100644 --- a/collaboration/learning_goals.md +++ b/collaboration/learning_goals.md @@ -5,18 +5,21 @@ ### πŸ§‘β€πŸ’» Seamless Collaboration and Version Control - Use Git and GitHub effectively for version control and collaboration in group projects. -- Enhance team dynamics through effective use of GitHub features like pull requests and issue tracking. +- Enhance team dynamics through effective use of GitHub features like +pull requests and issue tracking. - Implement best practices for version control, code reviews, and continuous integration. ### 🀝 Strengthen Team Collaboration and Communication -- Build strong teamwork through mutual support, exchanging ideas, and solving problems together. +- Build strong teamwork through mutual support, exchanging ideas, +and solving problems together. - Foster open communication and feedback to improve group performance. - Navigate and manage conflicts in group settings to strengthen collaboration. ### 🎯 Deliver Exceptional Outcomes -- Maintain high standards in code quality, documentation, and achieve project milestones through collective effort. +- Maintain high standards in code quality, documentation, and achieve project +milestones through collective effort. - Participate in constructive code reviews and refine solutions collectively. ### 🌐 Expand Professional Networks @@ -30,12 +33,14 @@ Each team member will pursue the following professional development objectives: -- Practice Python to improve skills, write clean and readable code, and learn from good examples. +- Practice Python to improve skills, write clean and readable code, and learn +from good examples. - Explore computer science topics, focusing on debugging, testing, and unit testing. - Apply Python in data analysis and science. - Learn and effectively use Git and GitHub for collaboration and group projects. -- Gain confidence in debugging with tools like pdb,the VSCode debugger, and the trace module. +- Gain confidence in debugging with tools like pdb,the VSCode debugger, and the +trace module. - Work well in groups, exchange ideas, and improve through feedback and code reviews. - Build connections and improve communication skills. From cdceb02a89876a2c6f08559c222c9d2787849781 Mon Sep 17 00:00:00 2001 From: "Kareeiman K." Date: Sun, 29 Dec 2024 12:51:01 +0400 Subject: [PATCH 22/42] branch updates --- collaboration/constraints.md | 68 ++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 37 deletions(-) diff --git a/collaboration/constraints.md b/collaboration/constraints.md index a1bce8646..2ca8acd62 100644 --- a/collaboration/constraints.md +++ b/collaboration/constraints.md @@ -2,33 +2,29 @@ ## 🚧 **Clear Boundaries for Efficiency** -To ensure efficiency and balanced contributions, the project should have -**clear boundaries**. +To ensure efficiency and balanced contributions, the project should have clear boundaries. +Roles and responsibilities should be **well-defined** to prevent overlapping efforts. +Expectations should be set for balanced contributions, +considering each member’s constraints. +A **culture of constructive feedback** and solution-focused discussions should +be established. +A **clear process** for resolving conflicts is essential. -- Roles and responsibilities should be **well-defined** to prevent overlapping - efforts. -- Expectations should be set for **balanced contributions**, considering each - member’s **constraints**. -- A **culture of constructive feedback** and solution-focused discussions should - be established. -- A **clear process** for resolving conflicts is essential. +------------------------------ -These boundaries aim to create a **productive** and **supportive environment** -for the team. +These boundaries aim to create a productive and supportive environment for the team. ## 🌍 **External Constraints** -The team faces several **external constraints** impacting collaboration: +The team faces several external constraints impacting collaboration: - **🌍 Timezones**: Remote work across different timezones can be challenging. -- **🌐 Internet Access**: Limited or unstable internet access complicates - communication and online collaboration. +- **🌐 Internet Access**: Limited or unstable internet access complicates +communication and online collaboration. - **πŸ‘¨β€πŸ‘©β€πŸ‘§β€πŸ‘¦ Family & Work**: Some members are constrained by family and work - responsibilities. -- **πŸ“š Academic Commitments**: Others face time limitations due to university - final exams. - -________________________________________________________________________ +responsibilities. +- **πŸ“š Academic Commitments**: Others face time limitations due to university +final exams. ## βš™οΈ **Internal Involuntary Constraints** @@ -36,29 +32,27 @@ The team faces several **internal involuntary constraints** that affect their progress: - **πŸ“‚ Git & GitHub Knowledge**: Many members lack prior knowledge or experience - with Git and GitHub. -- **πŸ› οΈ Technical Expertise**: Limited technical expertise, combined with new - skills required, is a challenge to the team members. -- **⏳ Time Availability**: Balancing professional commitments and personal - responsibilities limits availability. +- with Git and GitHub. +- **πŸ› οΈ Technical Expertise**: Limited technical expertise, combined with new +skills required, is a challenge to the team members. +- **⏳ Time Availability**: Balancing professional commitments and personal +- responsibilities limits availability. These factors create hurdles in both **skill development** and **team collaboration**. -________________________________________________________________________ - ## πŸ› οΈ **Internal Voluntary Constraints** -Members commit to the following **voluntary constraints** to ensure steady -progress: - -- **πŸ“ Daily Progress Updates**: Members will provide daily updates on their - progress. -- **πŸ’» Medium-level Coding Challenges**: Focus on coding challenges that - match everyone’s skill level to promote learning. -- **βš–οΈ Balancing Commitments**: Prioritizing a balance between project work - and other commitments. -- **πŸ“¬ Asynchronous Communication**: Emphasis on using asynchronous methods - like GitHub issues and pull requests. +Members commit to the following **voluntary constraints** to ensure steady +gprogress: + +- **πŸ“ Daily Progress Updates**: Members will provide daily updates on their +- progress. +- **πŸ’» Medium-level Coding Challenges**: Focus on coding challenges that +- match everyone’s skill level to promote learning. +- **βš–οΈ Balancing Commitments**: Prioritizing a balance between project work +- and other commitments. +- **πŸ“¬ Asynchronous Communication**: Emphasis on using asynchronous methods +- like GitHub issues and pull requests. These guidelines aim to foster effective teamwork, **skill development**, and steady project progress. From c85a7e9ca847534edcd7e3ecfdbc5a2aa1b0aeb4 Mon Sep 17 00:00:00 2001 From: Tibyan Khalid Date: Sun, 29 Dec 2024 11:51:08 +0200 Subject: [PATCH 23/42] Some minor edits --- collaboration/constraints.md | 44 ++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/collaboration/constraints.md b/collaboration/constraints.md index 2ca8acd62..4607afbe8 100644 --- a/collaboration/constraints.md +++ b/collaboration/constraints.md @@ -3,20 +3,24 @@ ## 🚧 **Clear Boundaries for Efficiency** To ensure efficiency and balanced contributions, the project should have clear boundaries. + Roles and responsibilities should be **well-defined** to prevent overlapping efforts. + Expectations should be set for balanced contributions, considering each member’s constraints. + A **culture of constructive feedback** and solution-focused discussions should be established. -A **clear process** for resolving conflicts is essential. + +Moreover, a **clear process** for resolving conflicts is essential. ------------------------------ -These boundaries aim to create a productive and supportive environment for the team. +These boundaries aim to create a productive and supportive environment for our team. ## 🌍 **External Constraints** -The team faces several external constraints impacting collaboration: +Our team faces several external constraints impacting collaboration: - **🌍 Timezones**: Remote work across different timezones can be challenging. - **🌐 Internet Access**: Limited or unstable internet access complicates @@ -28,31 +32,33 @@ final exams. ## βš™οΈ **Internal Involuntary Constraints** -The team faces several **internal involuntary constraints** that affect their -progress: +Our team faces several **internal involuntary constraints** that affect the progress: - **πŸ“‚ Git & GitHub Knowledge**: Many members lack prior knowledge or experience -- with Git and GitHub. +with Git and GitHub. - **πŸ› οΈ Technical Expertise**: Limited technical expertise, combined with new -skills required, is a challenge to the team members. +skills required, is a challenge to our team members. - **⏳ Time Availability**: Balancing professional commitments and personal -- responsibilities limits availability. +responsibilities limits availability. These factors create hurdles in both **skill development** and **team collaboration**. ## πŸ› οΈ **Internal Voluntary Constraints** -Members commit to the following **voluntary constraints** to ensure steady -gprogress: - -- **πŸ“ Daily Progress Updates**: Members will provide daily updates on their -- progress. -- **πŸ’» Medium-level Coding Challenges**: Focus on coding challenges that -- match everyone’s skill level to promote learning. -- **βš–οΈ Balancing Commitments**: Prioritizing a balance between project work -- and other commitments. -- **πŸ“¬ Asynchronous Communication**: Emphasis on using asynchronous methods -- like GitHub issues and pull requests. +Members commit to the following **voluntary constraints** to ensure steady progress: + +- **πŸ“ Daily Progress Updates**: +Members will provide daily updates on their +progress. +- **πŸ’» Medium-level Coding Challenges**: + We will focus on coding challenges that + match everyone’s skill level to promote learning. +- **βš–οΈ Balancing Commitments**: + We will prioritize a balance between project work +and other commitments. +- **πŸ“¬ Asynchronous Communication**: +Emphasis on using asynchronous methods +like GitHub issues and pull requests. These guidelines aim to foster effective teamwork, **skill development**, and steady project progress. From 20b968e7412f7c50e418a65c661980b8b4d41551 Mon Sep 17 00:00:00 2001 From: "Kareeiman K." Date: Sun, 29 Dec 2024 14:54:14 +0400 Subject: [PATCH 24/42] Fix Markdown issues and push constraints.md --- collaboration/constraints.md | 68 ++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 38 deletions(-) diff --git a/collaboration/constraints.md b/collaboration/constraints.md index 2ca8acd62..007814392 100644 --- a/collaboration/constraints.md +++ b/collaboration/constraints.md @@ -1,58 +1,50 @@ -# βš™οΈ **Project Boundaries & Constraints** +# βš™οΈ Project Boundaries & Constraints -## 🚧 **Clear Boundaries for Efficiency** +## 🚧 Clear Boundaries for Efficiency To ensure efficiency and balanced contributions, the project should have clear boundaries. -Roles and responsibilities should be **well-defined** to prevent overlapping efforts. -Expectations should be set for balanced contributions, -considering each member’s constraints. -A **culture of constructive feedback** and solution-focused discussions should -be established. -A **clear process** for resolving conflicts is essential. - ------------------------------- +Roles and responsibilities should be well-defined to prevent overlapping efforts. +Expectations should be set for balanced contributions, considering member's constraints. +A culture of constructive feedback and solution-focused discussions should be established. +A clear process for resolving conflicts is essential. These boundaries aim to create a productive and supportive environment for the team. -## 🌍 **External Constraints** +## 🌍 External Constraints The team faces several external constraints impacting collaboration: -- **🌍 Timezones**: Remote work across different timezones can be challenging. -- **🌐 Internet Access**: Limited or unstable internet access complicates -communication and online collaboration. -- **πŸ‘¨β€πŸ‘©β€πŸ‘§β€πŸ‘¦ Family & Work**: Some members are constrained by family and work -responsibilities. -- **πŸ“š Academic Commitments**: Others face time limitations due to university -final exams. +* **🌍 Timezones:** Remote work across different timezones can be challenging. +* **🌐 Internet Access:** Limited or unstable internet access complicates communication +and online collaboration. +* **πŸ‘¨β€πŸ‘©β€πŸ‘§β€πŸ‘¦ Family & Work:** Some members are constrained by family and work +responsibilities. +* **πŸ“š Academic Commitments:** Others face time limitations due to university exams. -## βš™οΈ **Internal Involuntary Constraints** +## βš™οΈ Internal Involuntary Constraints -The team faces several **internal involuntary constraints** that affect their -progress: +The team faces several **internal involuntary constraints** that affect their progress: -- **πŸ“‚ Git & GitHub Knowledge**: Many members lack prior knowledge or experience -- with Git and GitHub. -- **πŸ› οΈ Technical Expertise**: Limited technical expertise, combined with new -skills required, is a challenge to the team members. -- **⏳ Time Availability**: Balancing professional commitments and personal -- responsibilities limits availability. +* **πŸ“‚ Git & GitHub Knowledge:** Many members lack prior knowledge or experience +with Git and GitHub. +* **πŸ› οΈ Technical Expertise:** Limited technical expertise, combined with new skills +required, is a challenge to the team members. +* **⏳ Time Availability:** Balancing professional commitments and personal +responsibilities limits availability. These factors create hurdles in both **skill development** and **team collaboration**. -## πŸ› οΈ **Internal Voluntary Constraints** +## πŸ› οΈ Internal Voluntary Constraints -Members commit to the following **voluntary constraints** to ensure steady -gprogress: +Members commit to the following **voluntary constraints** to ensure steady progress: -- **πŸ“ Daily Progress Updates**: Members will provide daily updates on their -- progress. -- **πŸ’» Medium-level Coding Challenges**: Focus on coding challenges that -- match everyone’s skill level to promote learning. -- **βš–οΈ Balancing Commitments**: Prioritizing a balance between project work -- and other commitments. -- **πŸ“¬ Asynchronous Communication**: Emphasis on using asynchronous methods -- like GitHub issues and pull requests. +* **πŸ“ Daily Progress Updates:** Members will provide daily updates on their progress. +* **πŸ’» Medium-level Coding Challenges:** Focus on coding challenges that match +everyone's skill level to promote learning. +* **βš–οΈ Balancing Commitments:** Prioritizing a balance between project work and +other commitments. +* **πŸ“¬ Asynchronous Communication:** Emphasis on using asynchronous methods like +GitHub issues and pull requests. These guidelines aim to foster effective teamwork, **skill development**, and steady project progress. From ad6d8dfd0d20c9549e03a4a4aa8a0dd18ad4f006 Mon Sep 17 00:00:00 2001 From: "Kareeiman K." Date: Sun, 29 Dec 2024 15:31:52 +0400 Subject: [PATCH 25/42] Fix Markdown formatting issue --- collaboration/constraints.md | 55 +++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 22 deletions(-) diff --git a/collaboration/constraints.md b/collaboration/constraints.md index 007814392..f6240d69d 100644 --- a/collaboration/constraints.md +++ b/collaboration/constraints.md @@ -2,49 +2,60 @@ ## 🚧 Clear Boundaries for Efficiency -To ensure efficiency and balanced contributions, the project should have clear boundaries. +To ensure efficiency and balanced contributions, the project should have +clear boundaries. Roles and responsibilities should be well-defined to prevent overlapping efforts. -Expectations should be set for balanced contributions, considering member's constraints. -A culture of constructive feedback and solution-focused discussions should be established. +Expectations should be set for balanced contributions, considering +member's constraints. +A culture of constructive feedback and solution-focused discussions +should be established. A clear process for resolving conflicts is essential. -These boundaries aim to create a productive and supportive environment for the team. +These boundaries aim to create a productive and supportive environment +for the teams ## 🌍 External Constraints The team faces several external constraints impacting collaboration: -* **🌍 Timezones:** Remote work across different timezones can be challenging. -* **🌐 Internet Access:** Limited or unstable internet access complicates communication -and online collaboration. +* **🌍 Timezones:** Remote work across different timezones can +be challenging. +* **🌐 Internet Access:** Limited or unstable internet access complicates +communication and online collaboration. * **πŸ‘¨β€πŸ‘©β€πŸ‘§β€πŸ‘¦ Family & Work:** Some members are constrained by family and work responsibilities. -* **πŸ“š Academic Commitments:** Others face time limitations due to university exams. +* **πŸ“š Academic Commitments:** Others face time limitations due to +university exams. ## βš™οΈ Internal Involuntary Constraints -The team faces several **internal involuntary constraints** that affect their progress: +The team faces several **internal involuntary constraints** that affect +their progress: -* **πŸ“‚ Git & GitHub Knowledge:** Many members lack prior knowledge or experience -with Git and GitHub. -* **πŸ› οΈ Technical Expertise:** Limited technical expertise, combined with new skills +* **πŸ“‚ Git & GitHub Knowledge:** Many members lack prior knowledge or +experience with Git and GitHub. +* **πŸ› οΈ Technical Expertise:** Limited technical expertise, combined with +new skills required, is a challenge to the team members. * **⏳ Time Availability:** Balancing professional commitments and personal responsibilities limits availability. -These factors create hurdles in both **skill development** and **team collaboration**. +These factors create hurdles in both **skill development** and +**team collaboration**. ## πŸ› οΈ Internal Voluntary Constraints -Members commit to the following **voluntary constraints** to ensure steady progress: +Members commit to the following **voluntary constraints** to ensure +steady progress: -* **πŸ“ Daily Progress Updates:** Members will provide daily updates on their progress. -* **πŸ’» Medium-level Coding Challenges:** Focus on coding challenges that match -everyone's skill level to promote learning. -* **βš–οΈ Balancing Commitments:** Prioritizing a balance between project work and -other commitments. -* **πŸ“¬ Asynchronous Communication:** Emphasis on using asynchronous methods like -GitHub issues and pull requests. +* **πŸ“ Daily Progress Updates:** Members will provide daily updates on +their progress. +* **πŸ’» Medium-level Coding Challenges:** Focus on coding challenges that +match everyone's skill level to promote learning. +* **βš–οΈ Balancing Commitments:** Prioritizing a balance between project +work and other commitments. +* **πŸ“¬ Asynchronous Communication:** Emphasis on using asynchronous methods +like GitHub issues and pull requests. -These guidelines aim to foster effective teamwork, **skill development**, and +These guidelines aim to foster effective teamwork, skill development, and steady project progress. From 3abac60d7deefbd51508714b534174c42a3bc4ff Mon Sep 17 00:00:00 2001 From: "Kareeiman K." Date: Sun, 29 Dec 2024 16:53:05 +0400 Subject: [PATCH 26/42] Updated markdown content --- collaboration/constraints.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/collaboration/constraints.md b/collaboration/constraints.md index f6240d69d..fd39e372e 100644 --- a/collaboration/constraints.md +++ b/collaboration/constraints.md @@ -12,7 +12,7 @@ should be established. A clear process for resolving conflicts is essential. These boundaries aim to create a productive and supportive environment -for the teams +for the team ## 🌍 External Constraints From 701931bc1c98ff9388117d1cc5e0c94b7e3b61ae Mon Sep 17 00:00:00 2001 From: "Kareeiman K." Date: Sun, 29 Dec 2024 16:58:47 +0400 Subject: [PATCH 27/42] Updated markdown content2 --- collaboration/constraints.md | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/collaboration/constraints.md b/collaboration/constraints.md index fd39e372e..e4e2b003f 100644 --- a/collaboration/constraints.md +++ b/collaboration/constraints.md @@ -2,21 +2,21 @@ ## 🚧 Clear Boundaries for Efficiency -To ensure efficiency and balanced contributions, the project should have -clear boundaries. -Roles and responsibilities should be well-defined to prevent overlapping efforts. -Expectations should be set for balanced contributions, considering -member's constraints. -A culture of constructive feedback and solution-focused discussions -should be established. -A clear process for resolving conflicts is essential. - -These boundaries aim to create a productive and supportive environment -for the team +'''To ensure efficiency and balanced contributions, the project should have +clear boundaries.''' + +''' Roles and responsibilities should be well-defined to prevent overlapping efforts. +Expectations should be set for balanced contributions, considering member's constraints.''' +''' A culture of constructive feedback and solution-focused discussions +should be established.''' +''' A clear process for resolving conflicts is essential.''' + +''' These boundaries aim to create a productive and supportive environment +for the team''' ## 🌍 External Constraints -The team faces several external constraints impacting collaboration: +'''The team faces several external constraints impacting collaboration:''' * **🌍 Timezones:** Remote work across different timezones can be challenging. @@ -29,8 +29,8 @@ university exams. ## βš™οΈ Internal Involuntary Constraints -The team faces several **internal involuntary constraints** that affect -their progress: +'''The team faces several **internal involuntary constraints** that affect +their progress:''' * **πŸ“‚ Git & GitHub Knowledge:** Many members lack prior knowledge or experience with Git and GitHub. @@ -57,5 +57,5 @@ work and other commitments. * **πŸ“¬ Asynchronous Communication:** Emphasis on using asynchronous methods like GitHub issues and pull requests. -These guidelines aim to foster effective teamwork, skill development, and -steady project progress. +'''These guidelines aim to foster effective teamwork, skill development, and +steady project progress.''' From b9a472806364836cf4257f07ecd61d0697b3ca08 Mon Sep 17 00:00:00 2001 From: Kareiman Date: Sun, 29 Dec 2024 17:10:31 +0400 Subject: [PATCH 28/42] Update constraints.md --- collaboration/constraints.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/collaboration/constraints.md b/collaboration/constraints.md index e4e2b003f..e0723b4b8 100644 --- a/collaboration/constraints.md +++ b/collaboration/constraints.md @@ -2,21 +2,21 @@ ## 🚧 Clear Boundaries for Efficiency -'''To ensure efficiency and balanced contributions, the project should have -clear boundaries.''' +To ensure efficiency and balanced contributions, the project should have +clear boundaries. -''' Roles and responsibilities should be well-defined to prevent overlapping efforts. -Expectations should be set for balanced contributions, considering member's constraints.''' -''' A culture of constructive feedback and solution-focused discussions -should be established.''' -''' A clear process for resolving conflicts is essential.''' +Roles and responsibilities should be well-defined to prevent overlapping efforts. +Expectations should be set for balanced contributions, considering member's constraints. +A culture of constructive feedback and solution-focused discussions +should be established. +A clear process for resolving conflicts is essential. -''' These boundaries aim to create a productive and supportive environment -for the team''' +These boundaries aim to create a productive and supportive environment +for the team ## 🌍 External Constraints -'''The team faces several external constraints impacting collaboration:''' +The team faces several external constraints impacting collaboration: * **🌍 Timezones:** Remote work across different timezones can be challenging. From 3c2139333227dbbcaec39ec46403c757add37dc5 Mon Sep 17 00:00:00 2001 From: Kareiman Date: Sun, 29 Dec 2024 17:12:23 +0400 Subject: [PATCH 29/42] Update constraints.md --- collaboration/constraints.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/collaboration/constraints.md b/collaboration/constraints.md index e0723b4b8..eca3df12c 100644 --- a/collaboration/constraints.md +++ b/collaboration/constraints.md @@ -6,9 +6,12 @@ To ensure efficiency and balanced contributions, the project should have clear boundaries. Roles and responsibilities should be well-defined to prevent overlapping efforts. + Expectations should be set for balanced contributions, considering member's constraints. + A culture of constructive feedback and solution-focused discussions should be established. + A clear process for resolving conflicts is essential. These boundaries aim to create a productive and supportive environment From ab8df399ba22d4c13c9d89b002ddfce85368f1e2 Mon Sep 17 00:00:00 2001 From: Kareiman Date: Sun, 29 Dec 2024 17:19:08 +0400 Subject: [PATCH 30/42] Update constraints.md --- collaboration/constraints.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/collaboration/constraints.md b/collaboration/constraints.md index eca3df12c..e7c728c98 100644 --- a/collaboration/constraints.md +++ b/collaboration/constraints.md @@ -4,11 +4,11 @@ To ensure efficiency and balanced contributions, the project should have clear boundaries. - +--------------------------- Roles and responsibilities should be well-defined to prevent overlapping efforts. - +--------------------------- Expectations should be set for balanced contributions, considering member's constraints. - +______________________________________________________________________ A culture of constructive feedback and solution-focused discussions should be established. From b731b5a5df2aa505461a308e756224c2267e7768 Mon Sep 17 00:00:00 2001 From: Kareiman Date: Sun, 29 Dec 2024 17:21:05 +0400 Subject: [PATCH 31/42] Update constraints.md --- collaboration/constraints.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/collaboration/constraints.md b/collaboration/constraints.md index e7c728c98..2f16b0e0d 100644 --- a/collaboration/constraints.md +++ b/collaboration/constraints.md @@ -4,18 +4,14 @@ To ensure efficiency and balanced contributions, the project should have clear boundaries. ---------------------------- Roles and responsibilities should be well-defined to prevent overlapping efforts. ---------------------------- Expectations should be set for balanced contributions, considering member's constraints. -______________________________________________________________________ A culture of constructive feedback and solution-focused discussions should be established. - A clear process for resolving conflicts is essential. - These boundaries aim to create a productive and supportive environment for the team +______________________________________________________________________ ## 🌍 External Constraints From a0ac3fe7ec4071b04f68b96de6999186c641fe0e Mon Sep 17 00:00:00 2001 From: "Kareeiman K." Date: Sun, 29 Dec 2024 17:27:06 +0400 Subject: [PATCH 32/42] Updated markdown content2 --- collaboration/constraints.md | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/collaboration/constraints.md b/collaboration/constraints.md index e4e2b003f..522707fce 100644 --- a/collaboration/constraints.md +++ b/collaboration/constraints.md @@ -2,17 +2,20 @@ ## 🚧 Clear Boundaries for Efficiency -'''To ensure efficiency and balanced contributions, the project should have -clear boundaries.''' +To ensure efficiency and balanced contributions, +the project should have clear boundaries. -''' Roles and responsibilities should be well-defined to prevent overlapping efforts. -Expectations should be set for balanced contributions, considering member's constraints.''' -''' A culture of constructive feedback and solution-focused discussions -should be established.''' -''' A clear process for resolving conflicts is essential.''' +Roles and responsibilities should be well-defined to prevent overlapping efforts. -''' These boundaries aim to create a productive and supportive environment -for the team''' +Expectations should be set for balanced contributions, considering member's constraints. + +A culture of constructive feedback and solution-focused discussions +should be established. + +A clear process for resolving conflicts is essential. + +These boundaries aim to create a productive and supportive environment +for the team ## 🌍 External Constraints From fb2191d905b891ceb5da789584db700105632177 Mon Sep 17 00:00:00 2001 From: "Kareeiman K." Date: Sun, 29 Dec 2024 17:32:33 +0400 Subject: [PATCH 33/42] Updated markdown content2 --- collaboration/constraints.md | 109 +++++++++++++++++------------------ 1 file changed, 52 insertions(+), 57 deletions(-) diff --git a/collaboration/constraints.md b/collaboration/constraints.md index 0537b8b66..513f89e7d 100644 --- a/collaboration/constraints.md +++ b/collaboration/constraints.md @@ -1,64 +1,59 @@ # βš™οΈ Project Boundaries & Constraints -## 🚧 Clear Boundaries for Efficiency - -To ensure efficiency and balanced contributions, -the project should have clear boundaries. - -Roles and responsibilities should be well-defined to prevent overlapping efforts. - -Expectations should be set for balanced contributions, considering member's constraints. - -A culture of constructive feedback and solution-focused discussions -should be established. - -A clear process for resolving conflicts is essential. - -These boundaries aim to create a productive and supportive environment -for the team - -## 🌍 External Constraints - -The team faces several external constraints impacting collaboration: - -* **🌍 Timezones:** Remote work across different timezones can -be challenging. -* **🌐 Internet Access:** Limited or unstable internet access complicates -communication and online collaboration. -* **πŸ‘¨β€πŸ‘©β€πŸ‘§β€πŸ‘¦ Family & Work:** Some members are constrained by family and work -responsibilities. -* **πŸ“š Academic Commitments:** Others face time limitations due to -university exams. - -## βš™οΈ Internal Involuntary Constraints - -'''The team faces several **internal involuntary constraints** that affect +🚧 Clear Boundaries for Efficiency +To ensure efficiency and balanced +contributions, the project should have +clear boundaries. + +Roles and responsibilities should be +well-defined to prevent overlapping +efforts. + +Expectations should be set for +balanced contributions, considering +member's constraints. + +A culture of constructive feedback and +solution-focused discussions should be +established. + +A clear process for resolving conflicts +is essential. + +These boundaries aim to create a +productive and supportive environment +for the team. + +🌍 External Constraints +The team faces several external +constraints impacting collaboration: + +🌍 Timezones: Remote work across different timezones can be challenging. +🌐 Internet Access: Limited or unstable internet access complicates communication and online collaboration. +πŸ‘¨β€πŸ‘©β€πŸ‘§β€πŸ‘¦ Family & Work: Some members are constrained by family and work responsibilities. +πŸ“š Academic Commitments: Others face time limitations due to university exams. +βš™οΈ Internal Involuntary Constraints +'''The team faces several internal +involuntary constraints that affect their progress:''' -* **πŸ“‚ Git & GitHub Knowledge:** Many members lack prior knowledge or -experience with Git and GitHub. -* **πŸ› οΈ Technical Expertise:** Limited technical expertise, combined with -new skills -required, is a challenge to the team members. -* **⏳ Time Availability:** Balancing professional commitments and personal -responsibilities limits availability. +πŸ“‚ Git & GitHub Knowledge: Many members lack prior knowledge or experience with Git and GitHub. +πŸ› οΈ Technical Expertise: Limited technical expertise, combined with new skills required, is a challenge to the team members. +⏳ Time Availability: Balancing professional commitments and personal responsibilities limits availability. +These factors create hurdles in both +skill development and team +collaboration. -These factors create hurdles in both **skill development** and -**team collaboration**. - -## πŸ› οΈ Internal Voluntary Constraints - -Members commit to the following **voluntary constraints** to ensure +πŸ› οΈ Internal Voluntary Constraints +Members commit to the following +voluntary constraints to ensure steady progress: -* **πŸ“ Daily Progress Updates:** Members will provide daily updates on -their progress. -* **πŸ’» Medium-level Coding Challenges:** Focus on coding challenges that -match everyone's skill level to promote learning. -* **βš–οΈ Balancing Commitments:** Prioritizing a balance between project -work and other commitments. -* **πŸ“¬ Asynchronous Communication:** Emphasis on using asynchronous methods -like GitHub issues and pull requests. - -'''These guidelines aim to foster effective teamwork, skill development, and -steady project progress.''' +πŸ“ Daily Progress Updates: Members will provide daily updates on their progress. +πŸ’» Medium-level Coding Challenges: Focus on coding challenges that match everyone's skill level to promote learning. +βš–οΈ Balancing Commitments: Prioritizing a balance between project work and other commitments. +πŸ“¬ Asynchronous Communication: Emphasis on using asynchronous methods like GitHub issues and pull requests. +These guidelines aim to foster +effective teamwork, skill +development, and steady project +progress. From 30c247f28e99c4571164bc89eea12d91652f3535 Mon Sep 17 00:00:00 2001 From: "Kareeiman K." Date: Sun, 29 Dec 2024 17:33:50 +0400 Subject: [PATCH 34/42] Updated markdown content2 --- collaboration/constraints.md | 108 ++++++++++++++++++----------------- 1 file changed, 56 insertions(+), 52 deletions(-) diff --git a/collaboration/constraints.md b/collaboration/constraints.md index 513f89e7d..2e9e71bdc 100644 --- a/collaboration/constraints.md +++ b/collaboration/constraints.md @@ -1,59 +1,63 @@ # βš™οΈ Project Boundaries & Constraints -🚧 Clear Boundaries for Efficiency -To ensure efficiency and balanced -contributions, the project should have -clear boundaries. - -Roles and responsibilities should be -well-defined to prevent overlapping -efforts. - -Expectations should be set for -balanced contributions, considering -member's constraints. - -A culture of constructive feedback and -solution-focused discussions should be -established. - -A clear process for resolving conflicts -is essential. - -These boundaries aim to create a -productive and supportive environment -for the team. - -🌍 External Constraints -The team faces several external -constraints impacting collaboration: - -🌍 Timezones: Remote work across different timezones can be challenging. -🌐 Internet Access: Limited or unstable internet access complicates communication and online collaboration. -πŸ‘¨β€πŸ‘©β€πŸ‘§β€πŸ‘¦ Family & Work: Some members are constrained by family and work responsibilities. -πŸ“š Academic Commitments: Others face time limitations due to university exams. -βš™οΈ Internal Involuntary Constraints -'''The team faces several internal -involuntary constraints that affect +## 🚧 Clear Boundaries for Efficiency + +To ensure efficiency and balanced contributions,the project should have clear boundaries. + +Roles and responsibilities should be well-defined to prevent overlapping efforts. + +Expectations should be set for balanced contributions, considering member's constraints. + +A culture of constructive feedback and solution-focused discussions +should be established. + +A clear process for resolving conflicts is essential. + +These boundaries aim to create a productive and supportive environment +for the team + +## 🌍 External Constraints + +The team faces several external constraints impacting collaboration: + +* **🌍 Timezones:** Remote work across different timezones can +be challenging. +* **🌐 Internet Access:** Limited or unstable internet access complicates +communication and online collaboration. +* **πŸ‘¨β€πŸ‘©β€πŸ‘§β€πŸ‘¦ Family & Work:** Some members are constrained by family and work +responsibilities. +* **πŸ“š Academic Commitments:** Others face time limitations due to +university exams. + +## βš™οΈ Internal Involuntary Constraints + +'''The team faces several **internal involuntary constraints** that affect their progress:''' -πŸ“‚ Git & GitHub Knowledge: Many members lack prior knowledge or experience with Git and GitHub. -πŸ› οΈ Technical Expertise: Limited technical expertise, combined with new skills required, is a challenge to the team members. -⏳ Time Availability: Balancing professional commitments and personal responsibilities limits availability. -These factors create hurdles in both -skill development and team -collaboration. +* **πŸ“‚ Git & GitHub Knowledge:** Many members lack prior knowledge or +experience with Git and GitHub. +* **πŸ› οΈ Technical Expertise:** Limited technical expertise, combined with +new skills +required, is a challenge to the team members. +* **⏳ Time Availability:** Balancing professional commitments and personal +responsibilities limits availability. + +These factors create hurdles in both **skill development** and +**team collaboration**. + +## πŸ› οΈ Internal Voluntary Constraints -πŸ› οΈ Internal Voluntary Constraints -Members commit to the following -voluntary constraints to ensure +Members commit to the following **voluntary constraints** to ensure steady progress: -πŸ“ Daily Progress Updates: Members will provide daily updates on their progress. -πŸ’» Medium-level Coding Challenges: Focus on coding challenges that match everyone's skill level to promote learning. -βš–οΈ Balancing Commitments: Prioritizing a balance between project work and other commitments. -πŸ“¬ Asynchronous Communication: Emphasis on using asynchronous methods like GitHub issues and pull requests. -These guidelines aim to foster -effective teamwork, skill -development, and steady project -progress. +* **πŸ“ Daily Progress Updates:** Members will provide daily updates on +their progress. +* **πŸ’» Medium-level Coding Challenges:** Focus on coding challenges that +match everyone's skill level to promote learning. +* **βš–οΈ Balancing Commitments:** Prioritizing a balance between project +work and other commitments. +* **πŸ“¬ Asynchronous Communication:** Emphasis on using asynchronous methods +like GitHub issues and pull requests. + +These guidelines aim to foster effective teamwork, skill development, and +steady project progress. From 9ba43e3bd658890604924bda96feb188de4ad928 Mon Sep 17 00:00:00 2001 From: Tibyan Khalid Date: Sun, 29 Dec 2024 19:58:51 +0200 Subject: [PATCH 35/42] Fixed --- collaboration/communication.md | 92 ---------------------------------- 1 file changed, 92 deletions(-) diff --git a/collaboration/communication.md b/collaboration/communication.md index 671518049..e69de29bb 100644 --- a/collaboration/communication.md +++ b/collaboration/communication.md @@ -1,92 +0,0 @@ -# Communication - -______________________________________________________________________ - -## Communication Schedule - -| **Day** | **How** | **Topic of Discussion** | -|----------------|----------------------|-------------------------------------| -| Friday/Sunday | Video call (Zoom) | Update on progress/ complex discussions/ decision-making | -| Everyday | Slack | Quick questions, announcements | - -______________________________________________________________________ - -## Communication Channels - -**How often will we get in touch on each channel, and what we will discuss there:** - -- **Issues**: - - **Frequency**: Daily or as new issues arise. - - **Topics Discussed**: - - Bugs and their resolution. - - Feature requests or enhancements. - - Documentation or knowledge gaps. - - General project-related discussions requiring tracking. - -- **Pull Requests**: - - **Frequency**: As needed when code changes are ready for review. - - **Topics Discussed**: - - Code review and feedback. - - Suggestions for improvement or refactoring. - - Discussions on implementation details. - - Final approvals and merging criteria. - -- **Slack/Discord**: - - **Frequency**: Continuously throughout the workday. - - **Topics Discussed**: - - Quick questions or clarifications. - - Updates on progress or blockers. - - Sharing resources, links, or relevant information. - - Informal discussions or team bonding in designated channels. - -- **Video Calls**: - - **Frequency**: Weekly or bi-weekly, or as needed for critical discussions. - - **Topics Discussed**: - - Project planning and roadmap alignment. - - Sprint retrospectives or reviews. - - Deep-dive discussions on complex issues. - - Conflict resolution and decision-making. - -______________________________________________________________________ - -## Availability - -### Availability for Calling/Messaging - -| **Day** | **Monday** | **Tuesday** | **Wednesday** | **Thursday** | **Friday** | **Saturday** | **Sunday** | -|--------------|:----------:|:-----------:|:-------------:|:------------:|:----------:|:------------:|:----------:| -| Derek | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | -| Safaa | Available | Available | Available | Unavailable | Unavailable| Unavailable | Unavailable| -| Frankline | 9:00-11:00 | 9:00-11:00 | 9:00-11:00 | 9:00-11:00 | 9:00-11:00 | Unavailable | Unavailable| -| Tibyan | Unavailable| Available | Unavailable | Unavailable | Available | Available | Available | -| Azza | 4:00-6:00 | 4:00-12:00 | 4:00-12:00 | Unavailable | Unavailable| 12:00-14:00 | 4:00-12:00 | -| Kareiman | 12:00-19:00| 12:00-19:00 | 12:00-19:00 | 12:00-19:00 | 8:00-11:00 | 8:00-12:00 | 12:00-19:00| -| Eman | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | 12:00-2:00 | -| Shima | 11:00-1:00 | Unavailable | 11:00-1:00 | 11:00-1:00 | 11:00-1:00 | 11:00-1:00 | Unavailable| - ---- - -### Hours Available Per Day - -| **Days/Name** | **Monday** | **Tuesday** | **Wednesday** | **Thursday** | **Friday** | **Saturday** | **Sunday** | -|---------------|------------|-------------|---------------|--------------|------------|--------------|------------| -| Ambetsa | 2 hours | 2 hours | 2 hours | 2 hours | 2 hours | Unavailable | Unavailable| -| Derek | 2 hours | 2 hours | 2 hours | 2 hours | 2 hours | 2 hours | 2 hours | -| Safaa | 2 hours | 2 hours | 2 hours | Unavailable | Unavailable| 2 hours | 2 hours | -| Shima | 2 hours | Unavailable | 3 hours | 3 hours | 3 hours | 3 hours | Unavailable| -| Tibyan | 1 hour | 6 hours | 1 hour | 1 hour | 6 hours | 6 hours | 6 hours | -| Azza | 2 hours | 7 hours | 7 hours | Unavailable | Unavailable| 2 hours | 7 hours | -| Kareiman | 6 hours | 6 hours | 6 hours | 6 hours | 3 hours | 4 hours | 4 hours | -| Eman | 2 hours | 2 hours | 2 hours | 2 hours | 2 hours | 3 hours | 3 hours | - -______________________________________________________________________ - -## Asking for Help - -Here’s a guideline for when to ask for help based on how long you’ve been stuck: - -1. **0-30 minutes**: Try solving the issue independently. -2. **30-60 minutes**: Reach out to your group for help. -3. **60+ minutes**: Tag your coaches on Slack or GitHub for assistance. - ---- From bd22c5ff02980e707b0f4b1356256cfd5900a059 Mon Sep 17 00:00:00 2001 From: "Kareeiman K." Date: Sun, 29 Dec 2024 22:15:45 +0400 Subject: [PATCH 36/42] Updated markdown content2 --- collaboration/constraints.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/collaboration/constraints.md b/collaboration/constraints.md index 2e9e71bdc..f2da8cdd1 100644 --- a/collaboration/constraints.md +++ b/collaboration/constraints.md @@ -2,19 +2,22 @@ ## 🚧 Clear Boundaries for Efficiency -To ensure efficiency and balanced contributions,the project should have clear boundaries. +To ensure efficiency and balanced contributions,the project should have +clear boundaries. -Roles and responsibilities should be well-defined to prevent overlapping efforts. +Roles and responsibilities should be well-defined to prevent +overlapping efforts. -Expectations should be set for balanced contributions, considering member's constraints. +Expectations should be set for balanced contributions, considering +members' constraints. A culture of constructive feedback and solution-focused discussions should be established. A clear process for resolving conflicts is essential. -These boundaries aim to create a productive and supportive environment -for the team +These boundaries aim to create a productive and supportive +environment for the team ## 🌍 External Constraints From 41dd260f2d17e1eaaa1582801334a22ff5a293f0 Mon Sep 17 00:00:00 2001 From: Emanfalouji Date: Mon, 30 Dec 2024 19:41:11 -0500 Subject: [PATCH 37/42] communication --- collaboration/communication.md | 98 ++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/collaboration/communication.md b/collaboration/communication.md index e69de29bb..1747dd379 100644 --- a/collaboration/communication.md +++ b/collaboration/communication.md @@ -0,0 +1,98 @@ +# Communication + +--- + +## Communication Schedule + +| **Day** | **How** | **Topic of Discussion** | +|---------------|-------------------|---------------------------------| +| Friday/Sunday | Video call (Zoom) | Updates, discussions, decisions | +| Everyday | Slack | Quick questions, announcements | + +--- + +## Communication Channels + +**How often will we use each channel and what for:** + +- **Issues**: + - **Frequency**: Daily or as needed. + - **Topics**: Bugs, features, docs, and project discussions. + +- **Pull Requests**: + - **Frequency**: When ready for review. + - **Topics**: Code feedback, changes, and approval. + +- **Slack/Discord**: + - **Frequency**: Continuously. + - **Topics**: Questions, updates, links, and team bonding. + +- **Video Calls**: + - **Frequency**: Weekly or bi-weekly. + - **Topics**: Planning, retrospectives, and complex issues. + +--- + +## Availability + +### Availability for Calling/Messaging + +| **Day** | **Mon** | **Tue** | **Wed** | **Thu** | **Fri** | +|-----------|:-------:|:-------:|:-------:|:-------:|:-------:| +| Derek | βœ” | βœ” | βœ” | βœ” | βœ” | +| Safaa | βœ” | βœ” | βœ” | ✘ | ✘ | +| Frankline | βœ” | βœ” | βœ” | βœ” | βœ” | +| Tibyan | ✘ | βœ” | ✘ | ✘ | βœ” | +| Azza | βœ” | βœ” | βœ” | ✘ | ✘ | +| Kareiman | βœ” | βœ” | βœ” | βœ” | βœ” | +| Eman | βœ” | βœ” | βœ” | βœ” | βœ” | +| Shima | βœ” | ✘ | βœ” | βœ” | βœ” | + +| **Day** | **Sat** | **Sun** | +|-----------|:-------:|:-------:| +| Derek | βœ” | βœ” | +| Safaa | ✘ | ✘ | +| Frankline | ✘ | ✘ | +| Tibyan | βœ” | βœ” | +| Azza | βœ” | βœ” | +| Kareiman | βœ” | βœ” | +| Eman | βœ” | βœ” | +| Shima | βœ” | ✘ | + +--- + +### Hours Available Per Day + +| **Name** | **Mon** | **Tue** | **Wed** | **Thu** | **Fri** | +|------------|---------|---------|---------|---------|---------| +| Ambetsa | 2 | 2 | 2 | 2 | 2 | +| Derek | 2 | 2 | 2 | 2 | 2 | +| Safaa | 2 | 2 | 2 | ✘ | ✘ | +| Shima | 2 | ✘ | 3 | 3 | 3 | +| Tibyan | 1 | 6 | 1 | 1 | 6 | +| Azza | 2 | 7 | 7 | ✘ | ✘ | +| Kareiman | 6 | 6 | 6 | 6 | 3 | +| Eman | 2 | 2 | 2 | 2 | 2 | + +| **Name** | **Sat** | **Sun** | +|------------|---------|---------| +| Ambetsa | ✘ | ✘ | +| Derek | 2 | 2 | +| Safaa | 2 | 2 | +| Shima | 3 | ✘ | +| Tibyan | 6 | 6 | +| Azza | 2 | 7 | +| Kareiman | 4 | 4 | +| Eman | 3 | 3 | + +--- + +## Asking for Help + +Guidelines for asking help: + +1. **0-30 min**: Try solving independently. +2. **30-60 min**: Ask group members for help. +3. **60+ min**: Tag coaches on Slack/GitHub. + +--- From 66f652423d952ef2c5191493f48fefb7e306a938 Mon Sep 17 00:00:00 2001 From: Tibyan Khalid Date: Wed, 1 Jan 2025 16:56:16 +0200 Subject: [PATCH 38/42] Resolve conflict with upstream/main --- .github/PULL_REQUEST_TEMPLATE.md | 3 +++ .github/workflows/ci-checks.yml | 6 +++++- .vscode/settings.json | 12 +++++++++--- solutions/__init__.py | 1 + solutions/tests/__init__.py | 1 + 5 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 solutions/__init__.py create mode 100644 solutions/tests/__init__.py diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 330a04cbc..6e269b4ad 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -55,6 +55,7 @@ about: A template PR for code review with a checklist - [ ] The function's name describes it's behavior - [ ] The function's name matches the file name - [ ] The function has correct type annotations +- [ ] The function is not called in the function file ## Strategy @@ -82,5 +83,7 @@ about: A template PR for code review with a checklist - [ ] Variable names are clear and helpful - [ ] The code follows the strategy as simply as possible - [ ] The implementation is as simple as possible given the strategy +- [ ] There are no commented lines of code +- [ ] There are no `print` statements anywhere - [ ] The code includes defensive assertions - [ ] Defensive assertions include as little logic as possible diff --git a/.github/workflows/ci-checks.yml b/.github/workflows/ci-checks.yml index 48c2bad88..b3d7b0052 100644 --- a/.github/workflows/ci-checks.yml +++ b/.github/workflows/ci-checks.yml @@ -63,9 +63,13 @@ jobs: - name: Check for test files id: check_tests run: | - if find . -type f -name "test_*.py" | grep -q .; then + test_files=$(find ./solutions/tests -type f -name "test_*.py") + if [ -n "$test_files" ]; then + echo "Found test files:" + echo "$test_files" echo "has_tests=true" >> $GITHUB_OUTPUT else + echo "No test files found matching pattern ./solutions/tests/test_*.py" echo "has_tests=false" >> $GITHUB_OUTPUT fi shell: bash diff --git a/.vscode/settings.json b/.vscode/settings.json index e3cd76d7c..bbda5188d 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -114,7 +114,13 @@ // Enable/disable update table of contents on save "markdown.extension.toc.updateOnSave": false, - "githubPullRequests.ignoredPullRequestBranches": [ - "main" - ] + + "[python]": { + "editor.defaultFormatter": "charliermarsh.ruff", + "editor.formatOnSave": true, + "editor.codeActionsOnSave": { + "source.fixAll.ruff": true, + "source.organizeImports.ruff": true + } + } } diff --git a/solutions/__init__.py b/solutions/__init__.py new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/solutions/__init__.py @@ -0,0 +1 @@ + diff --git a/solutions/tests/__init__.py b/solutions/tests/__init__.py new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/solutions/tests/__init__.py @@ -0,0 +1 @@ + From 4820930e9400c0f86f107fc2f5fe2902050a91a8 Mon Sep 17 00:00:00 2001 From: AzzaOmer1 <103028535+AzzaOmer1@users.noreply.github.com> Date: Thu, 2 Jan 2025 19:46:53 +0300 Subject: [PATCH 39/42] edit it --- collaboration/learning_goals.md | 35 ++++++++++++++++----------------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/collaboration/learning_goals.md b/collaboration/learning_goals.md index c1f3f8a83..8cf6c5bcd 100644 --- a/collaboration/learning_goals.md +++ b/collaboration/learning_goals.md @@ -1,52 +1,51 @@ # Learning Goals -## πŸ† Collective Objectives +## πŸ† Collective Objectives πŸ† ### πŸ§‘β€πŸ’» Seamless Collaboration and Version Control -- Use Git and GitHub effectively for version control and collaboration in group projects. +- Use Git and GitHub effectively for version control and +collaboration in group projects. - Enhance team dynamics through effective use of GitHub features like pull requests and issue tracking. -- Implement best practices for version control, code reviews, and continuous integration. +- Implement best practices for version control, code reviews, +and continuous integration. -### 🀝 Strengthen Team Collaboration and Communication +### 🀝 Strengthen Team Collaboration and Communication - Build strong teamwork through mutual support, exchanging ideas, and solving problems together. -- Foster open communication and feedback to improve group performance. -- Navigate and manage conflicts in group settings to strengthen collaboration. +- Foster open communication and feedback to improve group performance. +- Navigate and manage conflicts in group settings to strengthen collaboration. -### 🎯 Deliver Exceptional Outcomes +### 🎯 Deliver Exceptional Outcomes - Maintain high standards in code quality, documentation, and achieve project milestones through collective effort. -- Participate in constructive code reviews and refine solutions collectively. +- Participate in constructive code reviews and refine solutions collectively. -### 🌐 Expand Professional Networks +### 🌐 Expand Professional Networks -- Strengthen team connections for future opportunities and collaborations. +- Strengthen team connections for future opportunities and collaborations. - Build relationships that support professional growth within and outside the team. ---- - -## πŸš€ Individual Objectives +## πŸš€ Individual Objectives πŸš€ Each team member will pursue the following professional development objectives: - Practice Python to improve skills, write clean and readable code, and learn from good examples. - Explore computer science topics, focusing on debugging, testing, and unit testing. -- Apply Python in data analysis and science. +- Apply Python in data analysis and science. - Learn and effectively use Git and GitHub for collaboration and group projects. - Gain confidence in debugging with tools like pdb,the VSCode debugger, and the trace module. - Work well in groups, exchange ideas, and improve through feedback and code reviews. -- Build connections and improve communication skills. +- Build connections and improve communication skills. -- Practice coding, documenting, testing, and debugging by solving challenges. +- Practice coding, documenting, testing, and debugging by solving challenges. -- Practice writing Python code using new language features. +- Practice writing Python code using new language features. - Explore academic topics and non-academic skills to build diverse expertise. - \ No newline at end of file From 675d7e91c9b6bfb9d5096330edc32e0d70103558 Mon Sep 17 00:00:00 2001 From: Frank2446-dotcom Date: Fri, 3 Jan 2025 22:51:27 +0300 Subject: [PATCH 40/42] Add dictionary merge solution and related test --- .vscode/settings.json | 7 +-- solutions/README.md | 29 ++++++++++++ solutions/__init__.py | 1 - solutions/merge_dictionaries.py | 49 ++++++++++++++++++++ solutions/tests/README.md | 33 ++++++++++++++ solutions/tests/test_merge_dictionaries.py | 52 ++++++++++++++++++++++ 6 files changed, 167 insertions(+), 4 deletions(-) create mode 100644 solutions/merge_dictionaries.py create mode 100644 solutions/tests/test_merge_dictionaries.py diff --git a/.vscode/settings.json b/.vscode/settings.json index bbda5188d..66af31ed7 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -119,8 +119,9 @@ "editor.defaultFormatter": "charliermarsh.ruff", "editor.formatOnSave": true, "editor.codeActionsOnSave": { - "source.fixAll.ruff": true, - "source.organizeImports.ruff": true + "source.fixAll.ruff": "explicit", + "source.organizeImports.ruff": "explicit" } - } + }, + "cSpell.words": ["unittests"] } diff --git a/solutions/README.md b/solutions/README.md index 9852346d2..a3f85b77b 100644 --- a/solutions/README.md +++ b/solutions/README.md @@ -1 +1,30 @@ # Solutions + +## Merge Dictionaries Solution + +This repository contains a Python solution to merge two dictionaries. +The solution merges two dictionaries by resolving conflicts based on an optional + conflict resolution function. + +### Features + +- Merges two dictionaries. +- Resolves conflicts with a custom function, or by default, `dict2` overwrites `dict1`. + +### How to Run + +1. Clone the repository. +2. Install dependencies (if any). +3. Run the tests: + + ```bash + python -m unittest solutions/tests/test_merge_dictionaries.py + ``` + +### Example + +```python +dict1 = {"a": 1, "b": 2} +dict2 = {"b": 3, "c": 4} +merged = merge_dictionaries(dict1, dict2) +print(merged) # Output: {'a': 1, 'b': 3, 'c': 4} diff --git a/solutions/__init__.py b/solutions/__init__.py index 8b1378917..e69de29bb 100644 --- a/solutions/__init__.py +++ b/solutions/__init__.py @@ -1 +0,0 @@ - diff --git a/solutions/merge_dictionaries.py b/solutions/merge_dictionaries.py new file mode 100644 index 000000000..57ef2588e --- /dev/null +++ b/solutions/merge_dictionaries.py @@ -0,0 +1,49 @@ +# solutions/merge_dictionaries.py + + +def merge_dictionaries(dict1, dict2, conflict_resolution=None): + """ + Merge two dictionaries into one. + + If keys conflict, a conflict resolution function can be provided + to decide which value to keep. If no function is provided, the value + from `dict2` will overwrite the value from `dict1`. + + Parameters: + dict1 (dict): The first dictionary. + dict2 (dict): The second dictionary. + conflict_resolution (function, optional): A function that takes + two arguments (value1, value2) and returns the resolved value. + + Returns: + dict: A merged dictionary. + + Example: + >>> merge_dictionaries({'a': 1}, {'a': 2, 'b': 3}) + {'a': 2, 'b': 3} + >>> merge_dictionaries({'a': 1}, {'a': 2, 'b': 3}, max) + {'a': 2, 'b': 3} + """ + merged = dict1.copy() # Start with a copy of the first dictionary + + for key, value in dict2.items(): + if key in merged and conflict_resolution: + # Resolve conflict using the provided function + merged[key] = conflict_resolution(merged[key], value) + else: + # Add or overwrite key with dict2's value + merged[key] = value + + return merged + + +if __name__ == "__main__": + # Example usage + dict_a = {"x": 1, "y": 2} + dict_b = {"y": 3, "z": 4} + + print("Default merge (dict_b overwrites):") + print(merge_dictionaries(dict_a, dict_b)) + + print("\nMerge with conflict resolution (max value):") + print(merge_dictionaries(dict_a, dict_b, max)) diff --git a/solutions/tests/README.md b/solutions/tests/README.md index 007eb9551..647035671 100644 --- a/solutions/tests/README.md +++ b/solutions/tests/README.md @@ -1 +1,34 @@ # Tests + +## Tests for Dictionary Merging with Conflict Resolution + +This folder contains unit tests for the dictionary merging and conflict resolution + functionalities implemented in the `merge_dictionaries.py` script. + +## Purpose + +The purpose of the tests is to ensure that the dictionary merging logic, +including handling conflicts, works as expected. The tests verify that: + +- Dictionaries are merged correctly. +- Conflict resolution logic (e.g., using the `max` function) + is applied properly when keys conflict. +- Edge cases and various scenarios are handled appropriately. + +## Test File Structure + +- `test_merge_dictionaries.py`: Contains unit tests for the `merge_dictionaries` + function. It includes tests for: + - Default dictionary merging (where dictionary B overwrites dictionary A). + - Conflict resolution merging (using the `max` value). + - Various edge cases, such as empty dictionaries, overlapping keys, and more. + +## Running the Tests + +To run the tests, follow these steps: + +1. **Navigate to the project root directory** (where the `solutions` folder is located): + + ```bash + cd /path/to/your/project + python -m unittest discover -s solutions/tests diff --git a/solutions/tests/test_merge_dictionaries.py b/solutions/tests/test_merge_dictionaries.py new file mode 100644 index 000000000..9aaa71fce --- /dev/null +++ b/solutions/tests/test_merge_dictionaries.py @@ -0,0 +1,52 @@ +# solutions/tests/test_merge_dictionaries.py + +import unittest +from solutions.merge_dictionaries import merge_dictionaries + + +class TestMergeDictionaries(unittest.TestCase): + def test_no_conflicts(self): + dict1 = {"a": 1, "b": 2} + dict2 = {"c": 3, "d": 4} + expected = {"a": 1, "b": 2, "c": 3, "d": 4} + self.assertEqual(merge_dictionaries(dict1, dict2), expected) + + def test_overwrite_conflicts(self): + dict1 = {"a": 1, "b": 2} + dict2 = {"b": 3, "c": 4} + expected = {"a": 1, "b": 3, "c": 4} + self.assertEqual(merge_dictionaries(dict1, dict2), expected) + + def test_conflict_resolution_max(self): + dict1 = {"a": 1, "b": 5} + dict2 = {"b": 3, "c": 4} + expected = {"a": 1, "b": 5, "c": 4} + self.assertEqual(merge_dictionaries(dict1, dict2, max), expected) + + def test_conflict_resolution_min(self): + dict1 = {"a": 1, "b": 5} + dict2 = {"b": 3, "c": 4} + expected = {"a": 1, "b": 3, "c": 4} + self.assertEqual(merge_dictionaries(dict1, dict2, min), expected) + + def test_empty_dicts(self): + dict1 = {} + dict2 = {} + expected = {} + self.assertEqual(merge_dictionaries(dict1, dict2), expected) + + def test_one_empty_dict(self): + dict1 = {"a": 1, "b": 2} + dict2 = {} + expected = {"a": 1, "b": 2} + self.assertEqual(merge_dictionaries(dict1, dict2), expected) + + def test_only_conflicts(self): + dict1 = {"a": 1} + dict2 = {"a": 2} + expected = {"a": 2} + self.assertEqual(merge_dictionaries(dict1, dict2), expected) + + +if __name__ == "__main__": + unittest.main() From 5e555c62fd73965ff5bd4af62f29a749246a7628 Mon Sep 17 00:00:00 2001 From: Frank2446-dotcom Date: Sat, 11 Jan 2025 23:35:50 +0300 Subject: [PATCH 41/42] Updated comments and covered all reviews --- solutions/merge_dictionaries.py | 38 ++++++++++++++-------- solutions/tests/test_merge_dictionaries.py | 31 ++++++++++++++++++ 2 files changed, 55 insertions(+), 14 deletions(-) diff --git a/solutions/merge_dictionaries.py b/solutions/merge_dictionaries.py index 57ef2588e..7b07cd3db 100644 --- a/solutions/merge_dictionaries.py +++ b/solutions/merge_dictionaries.py @@ -1,4 +1,12 @@ -# solutions/merge_dictionaries.py +""" +This module contains the implementation of the `merge_dictionaries` function. + +The `merge_dictionaries` function allows merging two dictionaries into one, +with support for resolving key conflicts through a custom resolution function. + +Created on 03 01 2025 +@author: Frankline Ambetsa +""" def merge_dictionaries(dict1, dict2, conflict_resolution=None): @@ -18,12 +26,26 @@ def merge_dictionaries(dict1, dict2, conflict_resolution=None): Returns: dict: A merged dictionary. - Example: + Raises: + AssertionError: If `dict1` or `dict2` is not a dictionary. + AssertionError: If `conflict_resolution` is not callable when provided. + + Examples: >>> merge_dictionaries({'a': 1}, {'a': 2, 'b': 3}) {'a': 2, 'b': 3} >>> merge_dictionaries({'a': 1}, {'a': 2, 'b': 3}, max) {'a': 2, 'b': 3} + >>> merge_dictionaries({'x': 1}, {'y': 2}) + {'x': 1, 'y': 2} """ + # Defensive assertions + assert isinstance(dict1, dict), "dict1 must be a dictionary." + assert isinstance(dict2, dict), "dict2 must be a dictionary." + if conflict_resolution is not None: + assert callable(conflict_resolution), ( + "conflict_resolution must be a callable function." + ) + merged = dict1.copy() # Start with a copy of the first dictionary for key, value in dict2.items(): @@ -35,15 +57,3 @@ def merge_dictionaries(dict1, dict2, conflict_resolution=None): merged[key] = value return merged - - -if __name__ == "__main__": - # Example usage - dict_a = {"x": 1, "y": 2} - dict_b = {"y": 3, "z": 4} - - print("Default merge (dict_b overwrites):") - print(merge_dictionaries(dict_a, dict_b)) - - print("\nMerge with conflict resolution (max value):") - print(merge_dictionaries(dict_a, dict_b, max)) diff --git a/solutions/tests/test_merge_dictionaries.py b/solutions/tests/test_merge_dictionaries.py index 9aaa71fce..e26e106b0 100644 --- a/solutions/tests/test_merge_dictionaries.py +++ b/solutions/tests/test_merge_dictionaries.py @@ -1,52 +1,83 @@ # solutions/tests/test_merge_dictionaries.py +""" +Unit tests for the `merge_dictionaries` function. + +These tests ensure correct behavior of the `merge_dictionaries` function, +including standard merging, conflict resolution, edge cases, and input validation. + +Created on 03 01 2025 +@author: Frankline Ambetsa +""" + import unittest from solutions.merge_dictionaries import merge_dictionaries class TestMergeDictionaries(unittest.TestCase): + """Unit tests for the `merge_dictionaries` function.""" + def test_no_conflicts(self): + """It should merge dictionaries with no conflicting keys.""" dict1 = {"a": 1, "b": 2} dict2 = {"c": 3, "d": 4} expected = {"a": 1, "b": 2, "c": 3, "d": 4} self.assertEqual(merge_dictionaries(dict1, dict2), expected) def test_overwrite_conflicts(self): + """It should overwrite conflicting keys with values from dict2.""" dict1 = {"a": 1, "b": 2} dict2 = {"b": 3, "c": 4} expected = {"a": 1, "b": 3, "c": 4} self.assertEqual(merge_dictionaries(dict1, dict2), expected) def test_conflict_resolution_max(self): + """It should resolve conflicts using the max function.""" dict1 = {"a": 1, "b": 5} dict2 = {"b": 3, "c": 4} expected = {"a": 1, "b": 5, "c": 4} self.assertEqual(merge_dictionaries(dict1, dict2, max), expected) def test_conflict_resolution_min(self): + """It should resolve conflicts using the min function.""" dict1 = {"a": 1, "b": 5} dict2 = {"b": 3, "c": 4} expected = {"a": 1, "b": 3, "c": 4} self.assertEqual(merge_dictionaries(dict1, dict2, min), expected) def test_empty_dicts(self): + """It should return an empty dictionary when both inputs are empty.""" dict1 = {} dict2 = {} expected = {} self.assertEqual(merge_dictionaries(dict1, dict2), expected) def test_one_empty_dict(self): + """It should return the non-empty dictionary when one input is empty.""" dict1 = {"a": 1, "b": 2} dict2 = {} expected = {"a": 1, "b": 2} self.assertEqual(merge_dictionaries(dict1, dict2), expected) def test_only_conflicts(self): + """It should overwrite keys with values from dict2 for conflicting keys.""" dict1 = {"a": 1} dict2 = {"a": 2} expected = {"a": 2} self.assertEqual(merge_dictionaries(dict1, dict2), expected) + def test_non_dict_inputs(self): + """It should raise a TypeError for non-dictionary inputs.""" + with self.assertRaises(AssertionError): + merge_dictionaries([], {"a": 1}) + with self.assertRaises(AssertionError): + merge_dictionaries({"a": 1}, 42) + + def test_invalid_conflict_resolution(self): + """It should raise a ValueError for non-callable conflict resolution.""" + with self.assertRaises(AssertionError): + merge_dictionaries({"a": 1}, {"a": 2}, conflict_resolution=42) + if __name__ == "__main__": unittest.main() From 2be0563e86a3611f52441329d0eb359469e9bb00 Mon Sep 17 00:00:00 2001 From: Frank2446-dotcom Date: Thu, 16 Jan 2025 00:05:26 +0300 Subject: [PATCH 42/42] Resolved issues in Dictionary-Merging-with-Conflict-Resolution branch --- solutions/merge_dictionaries.py | 2 +- solutions/tests/test_merge_dictionaries.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/solutions/merge_dictionaries.py b/solutions/merge_dictionaries.py index 7b07cd3db..c70d95c3d 100644 --- a/solutions/merge_dictionaries.py +++ b/solutions/merge_dictionaries.py @@ -4,7 +4,7 @@ The `merge_dictionaries` function allows merging two dictionaries into one, with support for resolving key conflicts through a custom resolution function. -Created on 03 01 2025 +Created on 15 01 2025 @author: Frankline Ambetsa """ diff --git a/solutions/tests/test_merge_dictionaries.py b/solutions/tests/test_merge_dictionaries.py index e26e106b0..fbbba371f 100644 --- a/solutions/tests/test_merge_dictionaries.py +++ b/solutions/tests/test_merge_dictionaries.py @@ -6,7 +6,7 @@ These tests ensure correct behavior of the `merge_dictionaries` function, including standard merging, conflict resolution, edge cases, and input validation. -Created on 03 01 2025 +Created on 15 01 2025 @author: Frankline Ambetsa """