Git gets interesting

This used to look pretty regular. Just two parallel lines with the devel branch connecting into the master branch here and there. But then I merged master into devel because I added issue templates on the github website directly into master. Things got….interesting….

Here’s the before (but a few weeks ago):

Here’s what it looks like now: