From 9b2be852672d90bcb29b8e5b661dd98d333c2f38 Mon Sep 17 00:00:00 2001 From: bansalHimanshi Date: Wed, 26 Mar 2025 10:37:25 +0530 Subject: [PATCH 1/5] Add files via upload --- contribution.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 contribution.txt diff --git a/contribution.txt b/contribution.txt new file mode 100644 index 0000000..e69de29 From 7174906f7562b20a1372a6bd809df73fda626acb Mon Sep 17 00:00:00 2001 From: bansalHimanshi Date: Wed, 26 Mar 2025 10:41:19 +0530 Subject: [PATCH 2/5] Update contribution.txt --- contribution.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contribution.txt b/contribution.txt index e69de29..7c33956 100644 --- a/contribution.txt +++ b/contribution.txt @@ -0,0 +1,3 @@ +Name: Himanshi +Roll no. : 2410990408 +Ideas: improve the documentation for beginners tomake it easier for them to get start with the project From a005e8a12a31d403a9d4a160a62330a570d7f923 Mon Sep 17 00:00:00 2001 From: Himanshi Date: Wed, 26 Mar 2025 12:11:47 +0530 Subject: [PATCH 3/5] add .gitignore to ignore *.log and temp directory , update README file --- .gitignore | 5 +++++ README.md | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 README.md diff --git a/.gitignore b/.gitignore index c2658d7..0a9250d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,6 @@ node_modules/ +Ignore all .log files +.log + + Ignore the temp directory +emp diff --git a/README.md b/README.md new file mode 100644 index 0000000..48c4ac7 --- /dev/null +++ b/README.md @@ -0,0 +1,43 @@ +#Project Title +A brief description of your project. + +## Description +A more detailed description of the project and its purpose. + +#Steps to Run the Project + +1. Clone the repository: + +bash + +git clone https://github.com/your-username/repository-name.git + +2. Navigate into the project directory: + +bash + +cd repository-name + +3. Follow the instructions to install dependencies (if applicable), for example: + +bash + +npm install # for Node.js projects + +pip install -r requirements.txt # for Python projects + +4. Run the project with: + +bash + +npm start # or another command based on the project + +##Contributing + +Fork the repository + +Clone your forked repository Create a new branch for your changes + +Make changes and commit them Push to your fork and create a pull request + +#Dancewebsite From 26d6e2338ef6492c427c215b8c7a62b6b6a09bdc Mon Sep 17 00:00:00 2001 From: bansalHimanshi Date: Wed, 26 Mar 2025 12:28:36 +0530 Subject: [PATCH 4/5] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 48c4ac7..60ccc2e 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,9 @@ #Project Title +SCM Assignment A brief description of your project. ## Description +This is description for master branch A more detailed description of the project and its purpose. #Steps to Run the Project From ebac57a3b923a68753fceedcf37ee866505a26a6 Mon Sep 17 00:00:00 2001 From: bansalHimanshi Date: Wed, 26 Mar 2025 12:31:11 +0530 Subject: [PATCH 5/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 60ccc2e..cf95cc2 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ SCM Assignment A brief description of your project. ## Description -This is description for master branch +This is description for conflict-demo A more detailed description of the project and its purpose. #Steps to Run the Project