Skip to content

Conflict demo #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
node_modules/
Ignore all .log files
.log

Ignore the temp directory
emp
45 changes: 45 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
#Project Title
SCM Assignment
A brief description of your project.

## Description
This is description for conflict-demo
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
3 changes: 3 additions & 0 deletions contribution.txt
Original file line number Diff line number Diff line change
@@ -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