Dictionary merging with conflict resolution

.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"]
 }

collaboration/README.md

@@ -1,5 +1,65 @@
-# Collaboration
+# 🌟Our Group Norms🌟
 
 <!-- group norms summary -->
 
-<!-- group norms list -->
+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 list -->
+
+## 📋 Group Norms for Collaboration
+
+ **💌 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.  
+
+ **🤝 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.  
+
+ **💡 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.  
+
+ **⚖️ Balance Collaboration and Decision-Making**  
+   Use discussions for brainstorming and debates for decisions.  
+   Ensure all perspectives are valued, and disagreements are  
+   handled constructively.  
+
+ **⏰ Respect Each Member’s Time**  
+   Plan meetings only when essential and provide agendas early.  
+   Use a shared calender to accommodate schedules and streamline  
+   communication.  
+
+**📢 Ensure Transparent Communication**  
+ Discussions and Progress Tracking: GitHub Issues, Pull Requests, project board.
+
+ 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.  
+
+ **🔄 Adapt and Support Flexibility**  
+   Be adaptable to personal challenges or unforeseen issues.  
+   Maintain a forgiving and understanding spirit.  
+
+ **🔍 Reflect and Improve Together**  
+   Regularly review team processes and suggest improvements to  
+   enhance collaboration, productivity, and growth.  
+
+ **🚀 Strive for Shared Purpose and Growth**  
+    Align individual and team goals to ensure meaningful work.  
+    Foster development, purpose, and shared accomplishments.  

collaboration/communication.md

@@ -1,54 +1,98 @@
-<!--
-    this template is for inspiration, feel free to change it however you like!
-
-    Careful! be sure to protect your privacy when filling out this document
-        everything you write here will be public
-        so share only what you are comfortable sharing online
-        you can share the rest in confidence with you group by another channel
--->
-
 # Communication
 
-______________________________________________________________________
+---
 
 ## Communication Schedule
 
-| Day | How | The topic of discussion | | --- | :-: | ----------------------- |
-| | | |
+| **Day**       | **How**           | **Topic of Discussion**         |  
+|---------------|-------------------|---------------------------------|  
+| Friday/Sunday | Video call (Zoom) | Updates, discussions, decisions |  
+| Everyday      | Slack             | Quick questions, announcements  |  
+
+---
 
 ## Communication Channels
 
-how often will we get in touch on each channel, and what we will discuss there:
+**How often will we use each channel and what for:**  
 
-- **Issues**:
-- **Pull Requests**:
-- **Slack/Discord**:
-- **Video Calls**:
+- **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.  
 
-## Availability
+- **Slack/Discord**:  
+  - **Frequency**: Continuously.  
+  - **Topics**: Questions, updates, links, and team bonding.  
 
-### Availability for calling/messaging
+- **Video Calls**:  
+  - **Frequency**: Weekly or bi-weekly.  
+  - **Topics**: Planning, retrospectives, and complex issues.  
 
-| Day | Monday | Tuesday | Wednesday | Thursday | Friday | Saturday | Sunday | |
------- | :----: | :-----: | :-------: | :------: | :----: | :------: | :----: |
-| _name_ | | | | | | | |
+---
 
-### How many hours everyone has per day
+## Availability
 
-- name: _5h_;
-- name: _6h_;
-- name: _5h_;
-- name: _4h_;
-- name: _3h_;
+### 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
 
-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:
+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.  
 
-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
+---

collaboration/constraints.md

@@ -1,34 +1,66 @@
-<!-- this template is for inspiration, feel free to change it however you like! -->
+# ⚙️ Project Boundaries & Constraints
 
-# Constraints
+## 🚧 Clear Boundaries for Efficiency
 
-Some boundaries around our project.
+To ensure efficiency and balanced contributions,the project should have
+clear boundaries.
 
-## External
+Roles and responsibilities should be well-defined to prevent
+overlapping efforts.
 
-<!--
-  constraints coming from the outside that your team has no control over:
-  - project deadlines
-  - number of unit tests required to pass a code review
-  - technologies (sometimes a client will tell you what to use)
-  - power or connectivity
-  - ...
--->
+Expectations should be set for balanced contributions, considering
+members' constraints.
 
-## Internal: Involuntary
+A culture of constructive feedback and solution-focused discussions
+should be established.
 
-<!--
-  constraints that come from within your team, and you have no control over:
-  - each of your individual skill levels
-  - amount of time available to work on the project
--->
+A clear process for resolving conflicts is essential.
 
-## Internal: Voluntary
+These boundaries aim to create a productive and supportive
+environment for the team
 
-<!--
-  constraints that your team decided on to help scope the project. they may include:
-  - coding style & conventions
-  - agree on a code review checklist for the project repository
-  - the number of hours you want to spend working
-  - only using the colors black and white
--->
+## 🌍 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**.
+
+## 🛠️ 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.

collaboration/learning_goals.md

@@ -1,5 +1,51 @@
 # 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.

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}

solutions/__init__.py

@@ -1 +0,0 @@
-