3 Commits

Author SHA1 Message Date
b88b3e4605 Updated assignment file 2025-09-10 17:09:36 +05:30
5251743ba6 Added an command to assignment file 2025-09-10 17:06:16 +05:30
dde586a637 Added an entry into assignment file 2025-09-10 17:01:51 +05:30
14 changed files with 15 additions and 63 deletions

View File

@@ -23,54 +23,3 @@
Shows detailed changes for each commit in the file.
## Viewing File History with Blame
## 1. git blame assignment.txt
![alt text](<git blame assignment.png>)
## 2. git blame -L 1,5 assignment.txt
![alt text](<git blame -L 1,5 assignment.png>)
## 3. git blame assignment.txt
![alt text](<git blame -e assignment.png>)
## Who changed each line of the file?
Renejit
## How does -L help when the file is large?
To view the history of specific lines in a file.
## What extra information does -e provide?
To get the email id of the user who made the chages in the file.
## Merging Branches
![alt text](<fast-forward merge-1.png>)
![alt text](<fast-forward merge-2.png>)
## Merge Conflict
![alt text](<add number in main and training branch.png>)
![alt text](<merge conflict.png>)
![alt text](<merge conflict1.png>)
## Did Git perform a fast-forward merge or a 3-way merge?
Perform fast-forward merge and merge conflict
## What does git log --graph --oneline --all show after the merge?
![alt text](<git log--graph--oneline--all.png>)
## git log --graph --oneline --all after Merge conflict
![alt text](<git log graph oneline after merge conflict.png>)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 56 KiB

View File

@@ -7,3 +7,15 @@ git log -p --<filename> :
git log --oneline --<filename> :
shows commit history in short form for the specific file
Tel No: Mandatory 8 characters
git clone for specific branch git clone --branch <branch-name> --single-branch <repo-url>
Renewal Flow
Reshop Flow
Mortgage Inaccurate Flow
Paid/Unpaid Flow
Insured Billing & Mortgage Billing Flow

Binary file not shown.

Before

Width:  |  Height:  |  Size: 97 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 78 KiB

View File

@@ -1,10 +1,2 @@
1
2
3
4
5
6
7
8
9
10
hello
Hi

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 62 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 51 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 127 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 116 KiB

Submodule git-practice-Renejit deleted from 8ee5230729

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB