Merging strategy makes it hard to track changes

[robtaylor]

Currently it seems most work is done on immelon's personal repo, then merged in with a merge commit.

It would be much easier to track and for others to contribute if you use the policy of rebase-and-merge for master, and rebase onto head instead of a merge commit.

Happy to help if any assistance with git or github needed.

[0xharry]

Thank you for your invaluable advice. We are working on establishing a proper code of conduct, including the commit and merge rules. And we will give serious consideration to this policy.