Published: | Updated:
In this lab I’ve learned more about branching and how to resolve conflicts between commits when merge child branch into master branch.
First I cloned my project from Github using
git clone link-to-project and created other branches which are named as its issues (issue-8/issue-9) and started to implement new features for each branch (8, 9). When I’ve done it, then tried to merge it to master, there were some conflicts going on. Finally I had to fix the code and made changes to the current branch then merge them one by one. This course, so far, I’ve learned what Git can do in software development and how I can collaborate with other fellow to develop a project together.
Some important commands to keep in mind:
git branch xxx / git checkout -b xxx master
git merge xxx (from master)