The key to solve conflicts is:
You have to understand what are the two commits that touched a given line (one from master, one from features), and then combine them somehow.
Articles by others on the same topic
There are currently no matching articles.