From 8018c7d3f2e4d58019427cbe87b1aadfb2ff887d Mon Sep 17 00:00:00 2001
From: Nikhil <nikhil0751.be23@chitkara.edu.in>
Date: Wed, 6 Mar 2024 22:24:24 +0530
Subject: [PATCH 1/6] calculator

---
 PythonFunctionCalculator.py => Nikhil_2310990751.py | Bin
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename PythonFunctionCalculator.py => Nikhil_2310990751.py (100%)

diff --git a/PythonFunctionCalculator.py b/Nikhil_2310990751.py
similarity index 100%
rename from PythonFunctionCalculator.py
rename to Nikhil_2310990751.py

From a8add239aadf68c5f4b0deabb00e6c04de77a0af Mon Sep 17 00:00:00 2001
From: Nikhil <nikhil0751.be23@chitkara.edu.in>
Date: Thu, 28 Mar 2024 21:17:38 +0530
Subject: [PATCH 2/6] Added about my calculator

---
 hello.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 hello.txt

diff --git a/hello.txt b/hello.txt
new file mode 100644
index 0000000..843a094
--- /dev/null
+++ b/hello.txt
@@ -0,0 +1 @@
+This is my enhanced calculator!

From 8528c1c32354782f9ed77e5b14e9c644c79a4484 Mon Sep 17 00:00:00 2001
From: Nikhil <nikhil0751.be23@chitkara.edu.in>
Date: Mon, 1 Apr 2024 17:49:42 +0530
Subject: [PATCH 3/6] hello

---
 Assignment_02_Mar2024       |  38 +++++++++++++++++
 PythonFunctionCalculator.py | Bin 0 -> 642 bytes
 TeamAssignment_Mar_2024     |  79 ++++++++++++++++++++++++++++++++++++
 pluto.txt                   |   1 +
 4 files changed, 118 insertions(+)
 create mode 100644 Assignment_02_Mar2024
 create mode 100644 PythonFunctionCalculator.py
 create mode 100644 TeamAssignment_Mar_2024
 create mode 100644 pluto.txt

diff --git a/Assignment_02_Mar2024 b/Assignment_02_Mar2024
new file mode 100644
index 0000000..2af97b8
--- /dev/null
+++ b/Assignment_02_Mar2024
@@ -0,0 +1,38 @@
+Assignment:
+
+Title: Simulation and Resolution of Merge Conflict on GitHub
+
+Objective:
+To understand the process of creating and resolving merge conflicts on GitHub.
+
+Instructions:
+
+Step 1: Open your GitHub account and move to you repository on Github.
+
+Step 2: Switch to the "main" branch of the repository.
+
+Step 3: Create a new code file named "Codefile" in the "main" branch. Add the following text to the file:
+```
+"This is the file to create merge conflict."
+```
+
+Step 4: Switch to another branch named "GitBranch_01".
+
+Step 5: Create a new code file named "Codefile1" in the "GitBranch_01" branch. Add the following text to the file:
+```
+"This is the file to create merge conflict.
+
+This file is in another branch!!
+
+We are here to create conflict!!"
+```
+
+Step 6: Return to the "main" branch.
+
+Step 7: Create a pull request to merge both branches. 
+
+Step 8: Resolve the conflict. Merge both branches after resolving the conflict.
+
+Submission:
+Submit a report detailing the steps you followed to simulate and resolve the merge conflict. Include screenshots of the GitHub interface at various stages of the process to demonstrate your understanding. Additionally, provide a brief explanation of how you resolved the conflict and merged the branches successfully.
+
diff --git a/PythonFunctionCalculator.py b/PythonFunctionCalculator.py
new file mode 100644
index 0000000000000000000000000000000000000000..cd8104d67843065f25f7fd566feca6ea0f8f3c56
GIT binary patch
literal 642
zcmah`yKciE6wS<69C@-UtCEvWmNG>hs}A`B2Sba50Re9N`MqFUG3n6FT%XrH*Lh`P
zU0nvvXFWvg5iOkX()tOOK8C2Q>3dWSa|;$%p#_f^VCLy23I?~{i{PvomHEKHGx^SC
zK!pw@j%n6WIjwj$XmQNbQGKaEhAmF{9p+o~i%g4`JQ6=7FHB6CSi=|_g?vz}DOlI0
zc*mwEPx8V!Jv%(*Db3bp-ijEo67f?Yep?tDo}mKzzG{;~vU=YNA-U9>GH#~!)<P0<
ztwee|fg&7fkrbRn8WPA63hJwgsX<~&<wIQg3q0j7jqd2H;8bz}XG)^pB|M|sw%;|q
i?}jm<|B#l-wnO|2KV^^IogNuMq!VmcEB_wYf&Bt=jLj4P

literal 0
HcmV?d00001

diff --git a/TeamAssignment_Mar_2024 b/TeamAssignment_Mar_2024
new file mode 100644
index 0000000..69a2cfc
--- /dev/null
+++ b/TeamAssignment_Mar_2024
@@ -0,0 +1,79 @@
+Assignment Title: Building Hangman Game Repository on GitHub
+
+Objective:
+The objective of this assignment is to create a team, collaborate on GitHub to create a repository for a Hangman game project using Python, and then share the repository link with the faculty.
+
+Requirements:
+1. Each student must have a GitHub account.
+2. Basic understanding of Python programming.
+3. Collaboration and teamwork skills.
+
+Assignment Steps:
+
+Step 1: Forming Teams
+   - Form teams of maximum 3 members each. ( 2 members minimum )
+   - Assign roles within the team (e.g., project manager, developer, tester).
+
+Step 2: Creating a GitHub Repository
+   - Choose one team member to create a new repository on GitHub.
+   - Name the repository something relevant, like "Hangman-Game-Project".
+   - Add a brief description outlining the purpose of the repository.
+
+Step 3: Adding Team Members as Contributors
+   - The team member who created the repository should add all other team members as contributors with appropriate access levels.
+   - Each team member should accept the invitation to join the repository.
+
+Step 4: Designing the Hangman Game
+   - Use the given Python Hangman game code as a reference.
+   - Discuss and design the game mechanics, including:
+     - Choosing a theme for the words (e.g., animals, countries, fruits).
+     - Implementing functions for displaying the hangman, checking guesses, and updating the game state.
+     - Incorporating features like scoring, difficulty levels, and hints (if desired).
+
+Step 5: Writing README.md File
+   - Create a README.md file in the repository.
+   - Include details about the project such as:
+     - Project title and description.
+     - Team members' names and roles.
+     - Instructions for running the game.
+     - Any additional features or notes.
+
+Step 6: Writing Python Game Code
+   - Write the Python code for the Hangman game.
+   - Ensure the code is well-commented and follows best practices.
+   - Include the necessary functions for gameplay, input handling, and game logic.
+
+Step 7: Testing and Debugging
+   - Test the game thoroughly to ensure it runs smoothly and without errors.
+   - Debug any issues or errors encountered during testing.
+   - Verify that the game mechanics work as intended.
+
+Step 8: Sharing Repository Link
+   - Once the repository is set up and the game is ready, share the repository link with the faculty using the provided Google Form link.
+   - Ensure that the repository is set to public or accessible to the faculty member.
+
+Submission Guidelines:
+   - Submit the GitHub repository link via the provided Google Form link.
+   - Ensure that all team members' names are mentioned in the README.md file.
+   - Make sure the repository contains both the README.md file and the Python game code (.py file).
+
+Deadline:
+   - The deadline for submission is 17th March 2024.
+   - Late submissions may incur penalties unless prior arrangements are made with the faculty.
+
+Evaluation Criteria:
+   - Completeness and functionality of the Hangman game.
+   - Quality of code and adherence to best practices.
+   - Collaboration and teamwork demonstrated on GitHub.
+   - Clarity and completeness of the README.md file.
+   - Timely submission and adherence to deadlines.
+
+Note:
+   - Reach out to the faculty or instructor if you encounter any issues or need clarification on any aspect of the assignment.
+   - Collaboration and communication within the team are crucial for the success of this assignment.
+
+  -- Sub,mit Public Repository of your project -- https://forms.gle/b31QvVXfFtVBjQa67
+
+Extra Resources: 
+
+  - Refrence game : ( Do not copy the code as it would be compared with your code. ) : https://replit.com/@vbhargav13/C78HangmanCapstone
diff --git a/pluto.txt b/pluto.txt
new file mode 100644
index 0000000..09cf5cf
--- /dev/null
+++ b/pluto.txt
@@ -0,0 +1 @@
+It is so a planet !

From d4496c7a92b1af309fb771d2aca6d8d08c564e1d Mon Sep 17 00:00:00 2001
From: Nikhil <nikhil0751.be23@chitkara.edu.in>
Date: Mon, 1 Apr 2024 19:01:01 +0530
Subject: [PATCH 4/6] hello

---
 1.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 1.txt

diff --git a/1.txt b/1.txt
new file mode 100644
index 0000000..ce01362
--- /dev/null
+++ b/1.txt
@@ -0,0 +1 @@
+hello

From ff4e21ad70dd348180b40c5e44bd715ae8aafbf3 Mon Sep 17 00:00:00 2001
From: Nikhil <nikhil0751.be23@chitkara.edu.in>
Date: Tue, 2 Apr 2024 09:11:48 +0530
Subject: [PATCH 5/6] File1.txt

---
 File1.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 File1.txt

diff --git a/File1.txt b/File1.txt
new file mode 100644
index 0000000..a8f9fd8
--- /dev/null
+++ b/File1.txt
@@ -0,0 +1 @@
+Hello 

From 5de55ea35c4555070c784f6bec53ef6bcb6f0808 Mon Sep 17 00:00:00 2001
From: Nikhil <nikhil0751.be23@chitkara.edu.in>
Date: Tue, 2 Apr 2024 09:15:16 +0530
Subject: [PATCH 6/6] hello

---
 File2.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 File2.txt

diff --git a/File2.txt b/File2.txt
new file mode 100644
index 0000000..e38404f
--- /dev/null
+++ b/File2.txt
@@ -0,0 +1,2 @@
+hello sir 
+hello sir