Hello, again guys!
Today is a Hands-On day!
Here we will impose a merge conflict on a file while merging them from two separate feature branches to the main branch. Next, we will solve the merge conflict.
Step 1
Create a text file(1.txt), and put it on the master branch.
Add a text line to the file as “this is first commit”
Step 2
Create a feature branch f1. In this branch, change this txt file and add a second line as “this is feature1”.
Step 3
From the master, create another feature branch f2.
In the text file, add a second line as “this is feature2”
Step 4
Merge f1 to master
Step 5
Merge f2 to master. You will face merge conflict.
Step 6
Resolve the merge conflict using merge tool
Step 7
Commit changes to master
I hope you were able to follow along with me. See you again tomorrow!
If this post was helpful, please follow and click the 💚 button below to show your support.
_ Thank you for reading!
_Sudipa