Thanks to visit codestin.com
Credit goes to www.scribd.com

Scribd
Upload
83 views3 pages

Labs 2

The document shows the steps taken to initialize a Git repository and create and manage branches. It initializes a Git repo in the labs2 directory, makes an initial commit, then creates two branches (b1 and b2). Changes are made on the branches but not committed. The branches are checked out, merged back into master, and deleted. This demonstrates basic Git branching and merging workflows.

Uploaded by

mesachit danai
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
83 views3 pages

Labs 2

The document shows the steps taken to initialize a Git repository and create and manage branches. It initializes a Git repo in the labs2 directory, makes an initial commit, then creates two branches (b1 and b2). Changes are made on the branches but not committed. The branches are checked out, merged back into master, and deleted. This demonstrates basic Git branching and merging workflows.

Uploaded by

mesachit danai
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

c

35845@LAPTOP-IP8SV8AD MINGW64 / (master)


$ cd /c/

35845@LAPTOP-IP8SV8AD MINGW64 /c (master)


$ mkdir labs2

35845@LAPTOP-IP8SV8AD MINGW64 /c (master)


$ cd labs2

35845@LAPTOP-IP8SV8AD MINGW64 /c/labs2 (master)


$ git init
Initialized empty Git repository in C:/labs2/.git/

35845@LAPTOP-IP8SV8AD MINGW64 /c/labs2 (master)


$ vim labs2.txt

35845@LAPTOP-IP8SV8AD MINGW64 /c/labs2 (master)


$ git add .
warning: LF will be replaced by CRLF in labs2.txt.
The file will have its original line endings in your working directory

35845@LAPTOP-IP8SV8AD MINGW64 /c/labs2 (master)


$ git commit -m " my first commit " labs2.txt
warning: LF will be replaced by CRLF in labs2.txt.
The file will have its original line endings in your working directory
[master (root-commit) d9f8c29] my first commit
1 file changed, 5 insertions(+)
create mode 100644 labs2.txt

35845@LAPTOP-IP8SV8AD MINGW64 /c/labs2 (master)


$ git branch b1

35845@LAPTOP-IP8SV8AD MINGW64 /c/labs2 (master)


$ git branch
b1
* master

35845@LAPTOP-IP8SV8AD MINGW64 /c/labs2 (master)


$ git checkout b1
Switched to branch 'b1'

35845@LAPTOP-IP8SV8AD MINGW64 /c/labs2 (b1)


$ git branch
* b1
master

35845@LAPTOP-IP8SV8AD MINGW64 /c/labs2 (b1)


$ git add .

35845@LAPTOP-IP8SV8AD MINGW64 /c/labs2 (b1)


$ git commit -m "Added line 1 in end of line 1"
On branch b1
nothing to commit, working tree clean

35845@LAPTOP-IP8SV8AD MINGW64 /c/labs2 (b1)


$ git checkout master
Switched to branch 'master'

35845@LAPTOP-IP8SV8AD MINGW64 /c/labs2 (master)


$ git branch
b1
* master

35845@LAPTOP-IP8SV8AD MINGW64 /c/labs2 (master)


$ git add .

35845@LAPTOP-IP8SV8AD MINGW64 /c/labs2 (master)


$ git commit -m "Added line 5 in end of line 5"
On branch master
nothing to commit, working tree clean
35845@LAPTOP-IP8SV8AD MINGW64 /c/labs2 (master)
$ git branch
b1
* master

35845@LAPTOP-IP8SV8AD MINGW64 /c/labs2 (master)


$ git merge b1
Already up to date.

35845@LAPTOP-IP8SV8AD MINGW64 /c/labs2 (master)


$ git branch
b1
* master

35845@LAPTOP-IP8SV8AD MINGW64 /c/labs2 (master)


$ git branch -d b1
Deleted branch b1 (was d9f8c29).

35845@LAPTOP-IP8SV8AD MINGW64 /c/labs2 (master)


$ git branch
* master

35845@LAPTOP-IP8SV8AD MINGW64 /c/labs2 (master)


$ git branch b2

35845@LAPTOP-IP8SV8AD MINGW64 /c/labs2 (master)


$ git branch
b2
* master

35845@LAPTOP-IP8SV8AD MINGW64 /c/labs2 (master)


$ git checkout b2
Switched to branch 'b2'

35845@LAPTOP-IP8SV8AD MINGW64 /c/labs2 (b2)


$ git branch
* b2
master

35845@LAPTOP-IP8SV8AD MINGW64 /c/labs2 (b2)


$ git add .

35845@LAPTOP-IP8SV8AD MINGW64 /c/labs2 (b2)


$ git commit -m "Software Development as 1st line "
On branch b2
nothing to commit, working tree clean

35845@LAPTOP-IP8SV8AD MINGW64 /c/labs2 (b2)


$ git commit -m ""
On branch b2
nothing to commit, working tree clean

35845@LAPTOP-IP8SV8AD MINGW64 /c/labs2 (b2)


$ git branch
* b2
master

35845@LAPTOP-IP8SV8AD MINGW64 /c/labs2 (b2)


$ git checkout master
Switched to branch 'master'

35845@LAPTOP-IP8SV8AD MINGW64 /c/labs2 (master)


$ git branch
b2
* master

35845@LAPTOP-IP8SV8AD MINGW64 /c/labs2 (master)


$ git add .

35845@LAPTOP-IP8SV8AD MINGW64 /c/labs2 (master)


$ git commit -m "SW Development as 1st line "
On branch master
nothing to commit, working tree clean

35845@LAPTOP-IP8SV8AD MINGW64 /c/labs2 (master)


$ git merge b2
Already up to date.

35845@LAPTOP-IP8SV8AD MINGW64 /c/labs2 (master)


$ git add .

35845@LAPTOP-IP8SV8AD MINGW64 /c/labs2 (master)


$ git commit -m "conflict resolved"
On branch master
nothing to commit, working tree clean

35845@LAPTOP-IP8SV8AD MINGW64 /c/labs2 (master)


$ git branch -d b2
Deleted branch b2 (was d9f8c29).

35845@LAPTOP-IP8SV8AD MINGW64 /c/labs2 (master)


$ git branch
* master

You might also like