Scribd
Upload
131 views9 pages

Git Merge Conflict PDF

Uploaded by

Swetha Sripathi
Copyright
© © All Rights Reserved
We take content rights seriously. If you suspect this is your content, claim it here.
Available Formats
Download as PDF, TXT or read online on Scribd
131 views9 pages

Git Merge Conflict PDF

Uploaded by

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

DevOps Certification Training

Module 5 : Git Assignment

Assignment 2 : Resolving Merge Conflicts


Creating a file Demo.java which prints “Hello World”.
Create 2 branches out of this master. Feature1 and Feature2
Make changes in feature 1 branch in the same line of code
Commit the code in feature1 branch
Now checkout the feature2 branch and make a change in the
same line as you did in feature1 and Commit the code in feature 2
branch
Merge the Feature2 branch in Feature1 branch. It should give a
merge conflict.
Resolve the merge conflict with the help of Kdiff3 or
Meld tool.
Verify the merge using git log command.

You might also like