[aequitas]

Please don't merge continuously, rebase instead. You have to handle the conflict one way or the other. But at least rebasing doesn't give you an incomprehensible git history filled with spaghetti and extraneous merge commits.

[ulisesrmzroche]

You can always squash the branch before merging back to master.