Scribd
Upload
17 views

Durai Git Exp 3

Uploaded by

monickmonu000
Copyright
© © All Rights Reserved
Available Formats
Download as PDF, TXT or read online on Scribd
17 views

Durai Git Exp 3

Uploaded by

monickmonu000
Copyright
© © All Rights Reserved
Available Formats
Download as PDF, TXT or read online on Scribd
You are on page 1/ 4

23CS2503 - Git and Github for beginners Lab URK23CS1185

Ex. No. 3 VERSION CONTROL IN SOFTWARE APPLICATION

Date of Exercise 13/01/2024


Aim:
To work with Version Control in software application development.
Version Control System:
Version control systems are a category of software tools that helps in recording
changes made to files by keeping a track of modifications done in the code.

Types of Version Control Systems:


• Local Version Control Systems
• Centralized Version Control Systems
• Distributed Version Control Systems

Three important steps of version control:


• git add changed files to version control tracking.
• git commit the changed files to create a unique snapshot of the local repository.
• git push those changed files from the local copy of a repository to the cloud

Check the Status of Changes Using GIT Status


Once you start working, you can use the git status command to check what changes are being
identified by git.

To practice working with this command, use the terminal to navigate to your git practice
repository:
$ cd practice-git-
skillz
Next, run git status.
$ git status
On branch main
Your branch is up to date with
'origin/main'. nothing to
commit, working tree clean

1
23CS2503 - Git and Github for beginners Lab URK23CS1185

Notice that when you run git status it returns: working tree clean. This means that
there are no changes to any files in your repo - YET.

Next, open and make a small change to the README.md file in a text editor. Then, run the
command git status to check that changes have been made to your file(s).
$ git status
On branch main

Your branch is up-to-date with


'origin/main'.Changes not
staged for commit:
modified: README.md
no changes added to commit (use "git add" and/or "git commit -a")
The output from the git status command above indicates that you have modified a
file (e.g. README.md) that can be added to version control.

Important Git Commands


These two commands make up the bulk of many workflows that use git for version control:
• git add: takes a modified file in your working directory and places the
modified version in a staging area for review.
• git commit: takes everything from the staging area and makes a permanent
snapshot of the current state of your repository that has a unique identifier.

Add Changed Files Using git add

After making changes, you can add either an


individual control tracking. To add a single file,
run the command:
git add file-name.extension
For example, to add the README.md file, you would use:
git add README.md
You can also add all of the files that you have edited at the same time using:
git add .

2
23CS2503 - Git and Github for beginners Lab URK23CS1185

Commit Changed Files Using git commit


Once you are ready to make a snapshot of the current state of your repository (i.e.
move changes from staging area), you can run git commit. The git commit command
requires a commit message that describes the snapshot (i.e. changes) that you made
in that commit. A commit message should outline what changed and why. These
messages:
1. help collaborators and your future self understand what was changed and why.
2. allow you and your collaborators to find (and undo if necessary) changes that
were previously made.

When you are not committing a lot of changes, you can create a short one line commit
message using the -m flag as follows:
git commit -m "Update title and author name in homework for week 3"

Creating branches
To keep track of changes to this file using git, you need to:
1. Clone the repository.
2. Move into the cloned repository
3. Create a new branch using the command (replace feature-branch with your desired
branch name).
4. git checkout -b feature-branch
5. Make modifications to files in your project.
6. Use git add to add the changes to the staging area
7. Commit the changes with a meaningful message

3
23CS2503 - Git and Github for beginners Lab URK23CS1185

Merging branches
To keep track of changes to this file using git, you need to:
1. Switch back to the main branch.
i. git checkout main
2. Merge the branch into the main branch
i. git merge feature-branch
3. Resolve conflicts (if necessary)
a. Open the conflicting files and resolve the conflicts manually.
b. After resolving conflicts, add the changes to the staging area and commit:
i. git add .
ii. git commit -m "Merge feature-branch into main"
4. Push changes to github using the following command.
i. git push origin main

Result:
Working with Version Control in software application development has been executed
successfully.

You might also like