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.

Or in other words, at every rebase conflict we have something like:
``
master-commit    feature-commit
|                |
|                |
base-commit------+
|
|
``
Therefore there are 2 diffs that you have to understand and reconcile:
* `base-commit` to `master-commit`
* `base-commit` to `feature-commit`


 The key to solve conflicts: see the two conflicting diffs