Paid Projects , Project ,

Merging and Resolving Merge Conflicts

In a real project, there are normally more than 1 person working and hence there are high chances to get merge conflict when we commit the changes. In this project, we will learn how to merge and how to resolve merge conflicts.
Course
Curriculum

What will you Learn in the Project?

1. How to create a Branching strategy?
2. How to create multiple branches?
3. How to clone a project from GitHub?
4. How to use the merge tool?
5. How to resolve merge conflicts?

Skills You Will Develop

Merge, Resolve merge conflicts

Tools Used

Git, GitHub

Tasks Performed

1. Clone GitHub project to local
2. Compare Git merge and Git rebase
3. Work with branches
4. Check merge conflict
5. Resolve merge conflict using merge tool

Course Content

Expand All
Not Enrolled
or

Skills you will develop

Work with branches

Check merge conflict

Resolve merge conflict

Compare Git merge and Git rebase

Share with Friends and earn points!!