Shipping changes
Merge
A merge incorporates work from another line of Git history into the current one. Git can combine compatible changes automatically. When changes conflict, you must decide the intended result; making the merge finish does not prove the resulting application works.
You might see: Git merge, merge conflict
In a real project
Your main branch changes a button label while a feature branch changes its color. Git may combine both. If both branches change the label differently, you review the competing changes and choose a coherent result.
A common mistake
Deleting conflict markers and calling the problem solved. Inspect the combined behavior and test it; both versions may contain work the final result needs.
Put it into practice
These lessons open through your account. Your kit determines which are available.
Go to the source
Sources checked .