Git: merge & conflicts
- Branches can be merged to have all the changes in only one branch
- When multiple changes conflict with each other, the merge fails:
Automatic merge failed; fix conflicts and then commit the result. - Solutions:
- Cherrypick the changes (can be quite long)
- Abandon your changes (and put them back later)
- Work on the latest commit (git pull) and have a good task repartition