From 424f9ce311d9dac901280921557e5f8cc2d90101 Mon Sep 17 00:00:00 2001 From: Abel Mesfin Teka Date: Sun, 22 Dec 2024 16:27:35 +0300 Subject: [PATCH 01/10] my first note --- notes/my_first_note.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 notes/my_first_note.md diff --git a/notes/my_first_note.md b/notes/my_first_note.md new file mode 100644 index 000000000..16eac75be --- /dev/null +++ b/notes/my_first_note.md @@ -0,0 +1,5 @@ +# Creating a local branch + +you can follow this procedure to create a local branch. + +1 From 6e3bec8951388724abb2abe11b093fd11eecfc3f Mon Sep 17 00:00:00 2001 From: Abel Mesfin Teka Date: Tue, 24 Dec 2024 21:42:21 +0300 Subject: [PATCH 02/10] group norms created and markdownlint updated --- .markdownlint.yml | 42 ++++++++++++++++++-- collaboration/README.md | 85 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 122 insertions(+), 5 deletions(-) diff --git a/.markdownlint.yml b/.markdownlint.yml index ee6205f5c..52b9d5266 100644 --- a/.markdownlint.yml +++ b/.markdownlint.yml @@ -1,3 +1,39 @@ -ignore: - - venv - - .github +# Focuses on core readability and consistency practices + +# Headings +MD003: # Heading style + style: consistent +MD004: # Unordered list style + style: consistent +MD007: # Unordered list indentation + indent: 2 + +# Line length and whitespace +MD013: # Line length + line_length: 8000 + strict: false + stern: false + +# Spacing and formatting +MD022: # Headings should be surrounded by blank lines + lines_above: 1 + lines_below: 1 +MD023: # Headings must start at the beginning of the line +MD030: # Spaces after list markers + ul_single: 1 + ol_single: 1 + ul_multi: 1 + ol_multi: 1 + +# Emphasis and strong +MD036: # Emphasis used instead of a heading + punctuation: ".,;:!?" + +# General best practices +MD047: true # Files should end with a single newline character +MD048: # Code block style (consistent backticks) + style: consistent + +# Disable some strict rules for beginners +MD024: false # Allow multiple headings with the same content +MD041: false # First line in a file being a top-level heading diff --git a/collaboration/README.md b/collaboration/README.md index 20889b951..e6e0038ff 100644 --- a/collaboration/README.md +++ b/collaboration/README.md @@ -1,5 +1,86 @@ -# Collaboration - +# 🌟 Our Group Norms +## ✨ Summary + +Our group norms emphasize **availability**, **trust**, **inclusivity**, and **adaptability** as cornerstones of effective collaboration. Trust is built through reliability, empathy, and accountability, fostering both cognitive and affective connections. Clear communication, respect, and time management ensure productive teamwork, while flexibility allows us to adapt to individual needs and project demands. Leadership is approached collaboratively, and norms evolve to maintain relevance, supported by thorough documentation and consistent standards. + +--- +## πŸ“‹ Group Norms + +### πŸ•’ Availability + +- **We will ensure availability** by committing to being accessible from afternoon to early evening in our local time zones, which aligns with **7 am to 1 pm EST**. + +### 🀝 Trust + +- **Cognitive Trust**: + We will consistently deliver quality work, meet deadlines, and communicate effectively. Reliability and competence will form the foundation of trust in each other’s abilities. +- **Affective Trust**: + We will cultivate trust by building personal connections through empathy, active listening, and support during challenges. Transparency, constructive feedback, and approachability will be key. +- **Addressing Damaged Trust**: + Mistakes will be acknowledged with sincerity, responsibility will be taken, and open communication will be used to restore confidence. + +### πŸ’¬ Discussion & Debate + +- **We will balance discussion and debate** by using each appropriately: + - *Discussion*: For collaborative brainstorming, sharing diverse perspectives, and fostering inclusivity. + - *Debate*: For resolving disagreements or evaluating competing ideas. + +### πŸ™Œ Respect + +- We will ensure **mutual respect** by actively listening, giving constructive feedback, and recognizing contributions. +- Disrespect, such as interruptions or dismissive behavior, will be avoided to maintain a positive group dynamic. + +### 🌍 Inclusivity + +- **We will foster inclusivity** by creating an environment where all voices are heard and valued. Respect for diverse perspectives and communication styles will ensure everyone feels included. + +### πŸ”„ Flexibility & Adaptability + +- **We will remain flexible** by adjusting to individual circumstances and evolving group norms as needed. Feedback and project demands will guide these changes. + +### πŸ“’ Communication + +- **We will prioritize clear communication** through: + - Slack for quick updates. + - Email for formal documentation. + - Virtual meetings for discussions and decisions. +- Agendas will keep meetings focused, and open discussions will encourage collaboration. + +### ⏰ Time Management + +- **We will respect schedules and deadlines** by: + - Allowing a 10-minute grace period for late arrivals. + - Using pre-set agendas for productive meetings. + - Coming prepared with completed tasks. + +### πŸ—³οΈ Decision-Making + +- **We will strive for consensus** and use majority votes when disagreements arise. +- Major decisions will be documented and shared transparently. + +### πŸ› οΈ Task Division & Collaboration + +- **Tasks will be divided fairly** using a "divide and conquer" approach to ensure equal contributions. +- Progress will be tracked to maintain accountability, and contributions will be respected regardless of task complexity. + +### πŸ”— Leadership + +- **We will handle leadership flexibly** by assigning leaders as needed or sharing responsibilities among all members. + +### πŸ’‘ Conflict Resolution + +- **We will address conflicts with openness and empathy**, focusing on collaborative resolutions. Mistakes will be acknowledged, and trust will be restored through accountability and dialogue. + +### πŸš€ Norm Evolution + +- **We will review and adapt norms** regularly as the team grows and challenges arise to keep them relevant and effective. + +### πŸ“ Documentation & Coding Standards + +- **We will maintain thorough documentation** of contributions, decisions, and progress. +- Coding standards will include consistent templates and camelCase naming conventions for variables and functions. + +--- From 544e4be02201060af220378ce3ed0d27fd0b6620 Mon Sep 17 00:00:00 2001 From: Khusro-S Date: Wed, 25 Dec 2024 02:25:37 +0300 Subject: [PATCH 03/10] Fix: Adjusted line length to meet character limit to fix the markdown linting error --- collaboration/guide/0_repository_setup.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/collaboration/guide/0_repository_setup.md b/collaboration/guide/0_repository_setup.md index 1e5e1aca7..ecd06d24b 100644 --- a/collaboration/guide/0_repository_setup.md +++ b/collaboration/guide/0_repository_setup.md @@ -14,7 +14,8 @@ repository and configure it for collaboration: - Change your [repository description](https://stackoverflow.com/questions/7757751/how-do-you-change-a-repository-description-on-github) - Add or remove topics from your repository - - Update your main README with your group name and an initial overview of your project. (You can change this as much as you want.) + - Update your main README with your group name and an initial overview of your + project. (You can change this as much as you want.) - Under settings in your repository select: - _Issues_ - _Projects_ From 306ad6f405df0cadd229c794d3ede9c8d25e3efd Mon Sep 17 00:00:00 2001 From: Abel Mesfin Teka Date: Wed, 25 Dec 2024 12:53:37 +0300 Subject: [PATCH 04/10] ci-checks updated --- .github/workflows/ci-checks.yml | 43 +++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci-checks.yml b/.github/workflows/ci-checks.yml index d56775453..76e6facee 100644 --- a/.github/workflows/ci-checks.yml +++ b/.github/workflows/ci-checks.yml @@ -4,19 +4,19 @@ on: [push, pull_request, workflow_dispatch] jobs: ls_linting: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: ls-lint/action@v2.2.3 + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: ls-lint/action@v2.2.3 md_formatting: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - uses: nosborn/github-action-markdown-cli@v3.3.0 - with: - files: . - config_file: .markdownlint.yml + - uses: actions/checkout@v4 + - uses: nosborn/github-action-markdown-cli@v3.3.0 + with: + files: . + config_file: .markdownlint.yml py_formatting: runs-on: ubuntu-latest @@ -52,12 +52,19 @@ jobs: shell: bash py_tests: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: python version - run: python --version - shell: bash - - name: Python - Run Tests - run: python -m unittest - shell: bash + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Check for Non-Markdown Changes + run: | + if ! git diff --name-only HEAD^1 | grep -E -v '\.md$'; then + echo "Only Markdown files changed. Skipping tests." + exit 0 + fi + shell: bash + - name: python version + run: python --version + shell: bash + - name: Python - Run Tests + run: python -m unittest + shell: bash From f2d6377b026f56024f1cea3adeec38ed2641a2cf Mon Sep 17 00:00:00 2001 From: YONATAN YISHAK YIFAT <53448650+YonatanBest@users.noreply.github.com> Date: Wed, 25 Dec 2024 12:54:15 +0300 Subject: [PATCH 05/10] Revert "Group norms" --- .markdownlint.yml | 42 +---------- collaboration/README.md | 85 +---------------------- collaboration/guide/0_repository_setup.md | 3 +- notes/my_first_note.md | 5 -- 4 files changed, 6 insertions(+), 129 deletions(-) delete mode 100644 notes/my_first_note.md diff --git a/.markdownlint.yml b/.markdownlint.yml index 52b9d5266..ee6205f5c 100644 --- a/.markdownlint.yml +++ b/.markdownlint.yml @@ -1,39 +1,3 @@ -# Focuses on core readability and consistency practices - -# Headings -MD003: # Heading style - style: consistent -MD004: # Unordered list style - style: consistent -MD007: # Unordered list indentation - indent: 2 - -# Line length and whitespace -MD013: # Line length - line_length: 8000 - strict: false - stern: false - -# Spacing and formatting -MD022: # Headings should be surrounded by blank lines - lines_above: 1 - lines_below: 1 -MD023: # Headings must start at the beginning of the line -MD030: # Spaces after list markers - ul_single: 1 - ol_single: 1 - ul_multi: 1 - ol_multi: 1 - -# Emphasis and strong -MD036: # Emphasis used instead of a heading - punctuation: ".,;:!?" - -# General best practices -MD047: true # Files should end with a single newline character -MD048: # Code block style (consistent backticks) - style: consistent - -# Disable some strict rules for beginners -MD024: false # Allow multiple headings with the same content -MD041: false # First line in a file being a top-level heading +ignore: + - venv + - .github diff --git a/collaboration/README.md b/collaboration/README.md index e6e0038ff..20889b951 100644 --- a/collaboration/README.md +++ b/collaboration/README.md @@ -1,86 +1,5 @@ -# 🌟 Our Group Norms - - -## ✨ Summary +# Collaboration -Our group norms emphasize **availability**, **trust**, **inclusivity**, and **adaptability** as cornerstones of effective collaboration. Trust is built through reliability, empathy, and accountability, fostering both cognitive and affective connections. Clear communication, respect, and time management ensure productive teamwork, while flexibility allows us to adapt to individual needs and project demands. Leadership is approached collaboratively, and norms evolve to maintain relevance, supported by thorough documentation and consistent standards. + ---- -## πŸ“‹ Group Norms - -### πŸ•’ Availability - -- **We will ensure availability** by committing to being accessible from afternoon to early evening in our local time zones, which aligns with **7 am to 1 pm EST**. - -### 🀝 Trust - -- **Cognitive Trust**: - We will consistently deliver quality work, meet deadlines, and communicate effectively. Reliability and competence will form the foundation of trust in each other’s abilities. -- **Affective Trust**: - We will cultivate trust by building personal connections through empathy, active listening, and support during challenges. Transparency, constructive feedback, and approachability will be key. -- **Addressing Damaged Trust**: - Mistakes will be acknowledged with sincerity, responsibility will be taken, and open communication will be used to restore confidence. - -### πŸ’¬ Discussion & Debate - -- **We will balance discussion and debate** by using each appropriately: - - *Discussion*: For collaborative brainstorming, sharing diverse perspectives, and fostering inclusivity. - - *Debate*: For resolving disagreements or evaluating competing ideas. - -### πŸ™Œ Respect - -- We will ensure **mutual respect** by actively listening, giving constructive feedback, and recognizing contributions. -- Disrespect, such as interruptions or dismissive behavior, will be avoided to maintain a positive group dynamic. - -### 🌍 Inclusivity - -- **We will foster inclusivity** by creating an environment where all voices are heard and valued. Respect for diverse perspectives and communication styles will ensure everyone feels included. - -### πŸ”„ Flexibility & Adaptability - -- **We will remain flexible** by adjusting to individual circumstances and evolving group norms as needed. Feedback and project demands will guide these changes. - -### πŸ“’ Communication - -- **We will prioritize clear communication** through: - - Slack for quick updates. - - Email for formal documentation. - - Virtual meetings for discussions and decisions. -- Agendas will keep meetings focused, and open discussions will encourage collaboration. - -### ⏰ Time Management - -- **We will respect schedules and deadlines** by: - - Allowing a 10-minute grace period for late arrivals. - - Using pre-set agendas for productive meetings. - - Coming prepared with completed tasks. - -### πŸ—³οΈ Decision-Making - -- **We will strive for consensus** and use majority votes when disagreements arise. -- Major decisions will be documented and shared transparently. - -### πŸ› οΈ Task Division & Collaboration - -- **Tasks will be divided fairly** using a "divide and conquer" approach to ensure equal contributions. -- Progress will be tracked to maintain accountability, and contributions will be respected regardless of task complexity. - -### πŸ”— Leadership - -- **We will handle leadership flexibly** by assigning leaders as needed or sharing responsibilities among all members. - -### πŸ’‘ Conflict Resolution - -- **We will address conflicts with openness and empathy**, focusing on collaborative resolutions. Mistakes will be acknowledged, and trust will be restored through accountability and dialogue. - -### πŸš€ Norm Evolution - -- **We will review and adapt norms** regularly as the team grows and challenges arise to keep them relevant and effective. - -### πŸ“ Documentation & Coding Standards - -- **We will maintain thorough documentation** of contributions, decisions, and progress. -- Coding standards will include consistent templates and camelCase naming conventions for variables and functions. - ---- diff --git a/collaboration/guide/0_repository_setup.md b/collaboration/guide/0_repository_setup.md index ecd06d24b..1e5e1aca7 100644 --- a/collaboration/guide/0_repository_setup.md +++ b/collaboration/guide/0_repository_setup.md @@ -14,8 +14,7 @@ repository and configure it for collaboration: - Change your [repository description](https://stackoverflow.com/questions/7757751/how-do-you-change-a-repository-description-on-github) - Add or remove topics from your repository - - Update your main README with your group name and an initial overview of your - project. (You can change this as much as you want.) + - Update your main README with your group name and an initial overview of your project. (You can change this as much as you want.) - Under settings in your repository select: - _Issues_ - _Projects_ diff --git a/notes/my_first_note.md b/notes/my_first_note.md deleted file mode 100644 index 16eac75be..000000000 --- a/notes/my_first_note.md +++ /dev/null @@ -1,5 +0,0 @@ -# Creating a local branch - -you can follow this procedure to create a local branch. - -1 From 076a27b2ecb8982ac7e1bac25feff3320883644c Mon Sep 17 00:00:00 2001 From: Abel Mesfin Teka Date: Wed, 25 Dec 2024 13:05:19 +0300 Subject: [PATCH 06/10] ci check updated --- .github/workflows/ci-checks.yml | 3 +-- notes/my_first_note.md | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-checks.yml b/.github/workflows/ci-checks.yml index 76e6facee..1fa7c27f3 100644 --- a/.github/workflows/ci-checks.yml +++ b/.github/workflows/ci-checks.yml @@ -50,8 +50,7 @@ jobs: - name: Python - Check Linting - pylint run: "pylint solutions tests || echo '::warning title=Pylint Error(s)::Discuss solutions and trade-offs in code review.'" shell: bash - - py_tests: + py_tests: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/notes/my_first_note.md b/notes/my_first_note.md index 16eac75be..854c9cc2d 100644 --- a/notes/my_first_note.md +++ b/notes/my_first_note.md @@ -3,3 +3,4 @@ you can follow this procedure to create a local branch. 1 +updating py_test From efd7017d81bcc6a4315b8fd699a4639bd6a389cb Mon Sep 17 00:00:00 2001 From: Abel Mesfin Teka Date: Wed, 25 Dec 2024 13:53:09 +0300 Subject: [PATCH 07/10] group norms repushed --- .markdownlint.yml | 1 - collaboration/README.md | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.markdownlint.yml b/.markdownlint.yml index 52b9d5266..005762b20 100644 --- a/.markdownlint.yml +++ b/.markdownlint.yml @@ -11,7 +11,6 @@ MD007: # Unordered list indentation # Line length and whitespace MD013: # Line length line_length: 8000 - strict: false stern: false # Spacing and formatting diff --git a/collaboration/README.md b/collaboration/README.md index e6e0038ff..e3b0e4502 100644 --- a/collaboration/README.md +++ b/collaboration/README.md @@ -3,7 +3,7 @@ ## ✨ Summary -Our group norms emphasize **availability**, **trust**, **inclusivity**, and **adaptability** as cornerstones of effective collaboration. Trust is built through reliability, empathy, and accountability, fostering both cognitive and affective connections. Clear communication, respect, and time management ensure productive teamwork, while flexibility allows us to adapt to individual needs and project demands. Leadership is approached collaboratively, and norms evolve to maintain relevance, supported by thorough documentation and consistent standards. +Our group norms emphasize **availability**, **trust**, **inclusivity**, and **adaptability** as cornerstones of effective collaboration. Trust is built through reliability, empathy, and accountability, fostering both cognitive and affective connections. Clear communication, respect, and time management ensure productive teamwork, while flexibility allows us to adapt to individual needs and project demands. Leadership is approached collaboratively, and norms evolve to maintain relevance, supported thorough documentation and consistent standards. --- From ba5e44049b4404ef78d8e832afe6b3226554a722 Mon Sep 17 00:00:00 2001 From: Abel Mesfin Teka Date: Wed, 25 Dec 2024 13:55:43 +0300 Subject: [PATCH 08/10] mistake fixed --- .markdownlint.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.markdownlint.yml b/.markdownlint.yml index 005762b20..52b9d5266 100644 --- a/.markdownlint.yml +++ b/.markdownlint.yml @@ -11,6 +11,7 @@ MD007: # Unordered list indentation # Line length and whitespace MD013: # Line length line_length: 8000 + strict: false stern: false # Spacing and formatting From de5973e3897251c3f4aef3378889b4b52a1891d6 Mon Sep 17 00:00:00 2001 From: Abel Mesfin Teka Date: Wed, 25 Dec 2024 13:57:27 +0300 Subject: [PATCH 09/10] m --- collaboration/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/collaboration/README.md b/collaboration/README.md index e3b0e4502..e6e0038ff 100644 --- a/collaboration/README.md +++ b/collaboration/README.md @@ -3,7 +3,7 @@ ## ✨ Summary -Our group norms emphasize **availability**, **trust**, **inclusivity**, and **adaptability** as cornerstones of effective collaboration. Trust is built through reliability, empathy, and accountability, fostering both cognitive and affective connections. Clear communication, respect, and time management ensure productive teamwork, while flexibility allows us to adapt to individual needs and project demands. Leadership is approached collaboratively, and norms evolve to maintain relevance, supported thorough documentation and consistent standards. +Our group norms emphasize **availability**, **trust**, **inclusivity**, and **adaptability** as cornerstones of effective collaboration. Trust is built through reliability, empathy, and accountability, fostering both cognitive and affective connections. Clear communication, respect, and time management ensure productive teamwork, while flexibility allows us to adapt to individual needs and project demands. Leadership is approached collaboratively, and norms evolve to maintain relevance, supported by thorough documentation and consistent standards. --- From 8d97dca9d7d4c0dfa4f5e7b877d915636218d93d Mon Sep 17 00:00:00 2001 From: Abel Mesfin Teka Date: Wed, 25 Dec 2024 14:06:25 +0300 Subject: [PATCH 10/10] Revert "Revert "Group norms"" --- .markdownlint.yml | 42 ++++++++++- collaboration/README.md | 85 ++++++++++++++++++++++- collaboration/guide/0_repository_setup.md | 3 +- notes/my_first_note.md | 5 ++ 4 files changed, 129 insertions(+), 6 deletions(-) create mode 100644 notes/my_first_note.md diff --git a/.markdownlint.yml b/.markdownlint.yml index ee6205f5c..52b9d5266 100644 --- a/.markdownlint.yml +++ b/.markdownlint.yml @@ -1,3 +1,39 @@ -ignore: - - venv - - .github +# Focuses on core readability and consistency practices + +# Headings +MD003: # Heading style + style: consistent +MD004: # Unordered list style + style: consistent +MD007: # Unordered list indentation + indent: 2 + +# Line length and whitespace +MD013: # Line length + line_length: 8000 + strict: false + stern: false + +# Spacing and formatting +MD022: # Headings should be surrounded by blank lines + lines_above: 1 + lines_below: 1 +MD023: # Headings must start at the beginning of the line +MD030: # Spaces after list markers + ul_single: 1 + ol_single: 1 + ul_multi: 1 + ol_multi: 1 + +# Emphasis and strong +MD036: # Emphasis used instead of a heading + punctuation: ".,;:!?" + +# General best practices +MD047: true # Files should end with a single newline character +MD048: # Code block style (consistent backticks) + style: consistent + +# Disable some strict rules for beginners +MD024: false # Allow multiple headings with the same content +MD041: false # First line in a file being a top-level heading diff --git a/collaboration/README.md b/collaboration/README.md index 20889b951..e6e0038ff 100644 --- a/collaboration/README.md +++ b/collaboration/README.md @@ -1,5 +1,86 @@ -# Collaboration - +# 🌟 Our Group Norms +## ✨ Summary + +Our group norms emphasize **availability**, **trust**, **inclusivity**, and **adaptability** as cornerstones of effective collaboration. Trust is built through reliability, empathy, and accountability, fostering both cognitive and affective connections. Clear communication, respect, and time management ensure productive teamwork, while flexibility allows us to adapt to individual needs and project demands. Leadership is approached collaboratively, and norms evolve to maintain relevance, supported by thorough documentation and consistent standards. + +--- +## πŸ“‹ Group Norms + +### πŸ•’ Availability + +- **We will ensure availability** by committing to being accessible from afternoon to early evening in our local time zones, which aligns with **7 am to 1 pm EST**. + +### 🀝 Trust + +- **Cognitive Trust**: + We will consistently deliver quality work, meet deadlines, and communicate effectively. Reliability and competence will form the foundation of trust in each other’s abilities. +- **Affective Trust**: + We will cultivate trust by building personal connections through empathy, active listening, and support during challenges. Transparency, constructive feedback, and approachability will be key. +- **Addressing Damaged Trust**: + Mistakes will be acknowledged with sincerity, responsibility will be taken, and open communication will be used to restore confidence. + +### πŸ’¬ Discussion & Debate + +- **We will balance discussion and debate** by using each appropriately: + - *Discussion*: For collaborative brainstorming, sharing diverse perspectives, and fostering inclusivity. + - *Debate*: For resolving disagreements or evaluating competing ideas. + +### πŸ™Œ Respect + +- We will ensure **mutual respect** by actively listening, giving constructive feedback, and recognizing contributions. +- Disrespect, such as interruptions or dismissive behavior, will be avoided to maintain a positive group dynamic. + +### 🌍 Inclusivity + +- **We will foster inclusivity** by creating an environment where all voices are heard and valued. Respect for diverse perspectives and communication styles will ensure everyone feels included. + +### πŸ”„ Flexibility & Adaptability + +- **We will remain flexible** by adjusting to individual circumstances and evolving group norms as needed. Feedback and project demands will guide these changes. + +### πŸ“’ Communication + +- **We will prioritize clear communication** through: + - Slack for quick updates. + - Email for formal documentation. + - Virtual meetings for discussions and decisions. +- Agendas will keep meetings focused, and open discussions will encourage collaboration. + +### ⏰ Time Management + +- **We will respect schedules and deadlines** by: + - Allowing a 10-minute grace period for late arrivals. + - Using pre-set agendas for productive meetings. + - Coming prepared with completed tasks. + +### πŸ—³οΈ Decision-Making + +- **We will strive for consensus** and use majority votes when disagreements arise. +- Major decisions will be documented and shared transparently. + +### πŸ› οΈ Task Division & Collaboration + +- **Tasks will be divided fairly** using a "divide and conquer" approach to ensure equal contributions. +- Progress will be tracked to maintain accountability, and contributions will be respected regardless of task complexity. + +### πŸ”— Leadership + +- **We will handle leadership flexibly** by assigning leaders as needed or sharing responsibilities among all members. + +### πŸ’‘ Conflict Resolution + +- **We will address conflicts with openness and empathy**, focusing on collaborative resolutions. Mistakes will be acknowledged, and trust will be restored through accountability and dialogue. + +### πŸš€ Norm Evolution + +- **We will review and adapt norms** regularly as the team grows and challenges arise to keep them relevant and effective. + +### πŸ“ Documentation & Coding Standards + +- **We will maintain thorough documentation** of contributions, decisions, and progress. +- Coding standards will include consistent templates and camelCase naming conventions for variables and functions. + +--- diff --git a/collaboration/guide/0_repository_setup.md b/collaboration/guide/0_repository_setup.md index 1e5e1aca7..ecd06d24b 100644 --- a/collaboration/guide/0_repository_setup.md +++ b/collaboration/guide/0_repository_setup.md @@ -14,7 +14,8 @@ repository and configure it for collaboration: - Change your [repository description](https://stackoverflow.com/questions/7757751/how-do-you-change-a-repository-description-on-github) - Add or remove topics from your repository - - Update your main README with your group name and an initial overview of your project. (You can change this as much as you want.) + - Update your main README with your group name and an initial overview of your + project. (You can change this as much as you want.) - Under settings in your repository select: - _Issues_ - _Projects_ diff --git a/notes/my_first_note.md b/notes/my_first_note.md new file mode 100644 index 000000000..16eac75be --- /dev/null +++ b/notes/my_first_note.md @@ -0,0 +1,5 @@ +# Creating a local branch + +you can follow this procedure to create a local branch. + +1