Software Git Tutorial EclipseCon France 2014 - Git Exercise 04 - merging rebasing and resolving conflicts

1.Merge, Rebase and how to resolve Conflicts In this exercise you will learn how to combine the work done in different branches and how to resolve the conflicts which can…