Closed edkerk closed 3 years ago
I tried to resolve a merge conflict, and thereby already merged this PR with master
. The merge conflict, together with the long list of commits mentioned in this PR, seems to be an artifact of PR #122 having been "squash merged". A better solution would be "rebase merge" in PR to devel
, and normal "merge commit" in PR to master
. Will document this in contributor guidelines.
Main improvements in this PR:
README.md
I hereby confirm that I have:
master
as a target branch (top left drop-down menu)