Scribd
Upload
23 views3 pages

Version Control with Git

Uploaded by

4672 Nathan Pereira
Copyright
© © All Rights Reserved
We take content rights seriously. If you suspect this is your content, claim it here.
Available Formats
Download as DOCX, PDF, TXT or read online on Scribd
23 views3 pages

Version Control with Git

Uploaded by

4672 Nathan Pereira
Copyright
© © All Rights Reserved
We take content rights seriously. If you suspect this is your content, claim it here.
Available Formats
Download as DOCX, PDF, TXT or read online on Scribd
You are on page 1/ 3

Name : Nathan Joseph Savio Pereira

Course name: Software Engineering


Course code:CSE3005 Register no:22BCE11187
Submitted to :Dr.Saravannan
Objective:
To understand the basics of version control, Git, and GitHub, and gain
hands-on experience with fundamental commands and workflows.

Activity Steps:
1. Set up the Repository:
o Visit the GitHub repository link provided:
VITB-SE/Software-Engineering.
o Clone the repository locally using:
bash
git clone https://github.com/VITB-SE/Software-Engineering.git
2. Task Identification:
o Add a README file: Create a file named README.md to
introduce the project. Include basic details such as:
 Project name
 Purpose
 How to contribute
o Update code: Add some sample code files or placeholders
to simulate team contributions.
3. Basic Git Commands:
o After creating or modifying files, use the following
commands:
bash
git add <filename> # Stage the changes
git commit -m "Add README file" # Commit the changes with a
message
git push # Push changes to the remote repository
4. Branching and Merging:
o Create a new branch for adding features or fixing bugs:
bash
git checkout -b feature-branch
o Make changes and push the branch:
bash
git push origin feature-branch
o Merge the branch into the main branch:
Bash
git checkout main
git merge feature-branch
5. Discuss Resolving Merge Conflicts:
o Simulate a merge conflict by modifying the same line in a
file on two different branches.
o Try to merge the branches:
bash
git merge conflicting-branch
o When a conflict arises, resolve it by manually editing the
file and marking it as resolved:
bash
git add <filename>
git commit
o Push the resolved changes to the repository.

You might also like