Release v0.8.0

[d4rken]

• [x] Merge dev into master
• [x] Add version tag
• [x] Create a draft release on github
• [x] Notify @d4rken when tag+draft release is created, to build a signed apk
• [x] Up the version in the dev branch

[bobheadxi]

Ah... i messed up the merging @_@

damn i messed it up real bad

S.O.S. @d4rken

[d4rken]

What happened?

[bobheadxi]

Rebase merge made master deviate a lot from dev, says there is a ~20 commit difference now

[d4rken]

No worries.

Check here for rebase vs merge.

Merging from dev into master is preferably done through a merge commit, not a rebase. Reserve rebase to update your own feature branches.

To fix this there are two options:

• Rewrite history by force pushing master and overwriting the changes. This is frowned upon in public repositories because it screws (conflicts galore) over anyone that has checked out the master branch already.
• Revert the commits and retry. This seems messy, but just costs us a bit spam in the log, and allows everyone who already cloned this repo to just pull the changes without conflict.

You already began the later option which is fine, though I think you also rebased them instead of merging them into master. Check the github button before pressing it 😉.

I'm now just merging (merge commit, not rebasing!) the dev branch into the master , I'll tag the final commit, build the apk and everything is in order.

To continue on dev with the next update I'll then pull the changes to master back into dev to get them to the same state.

[d4rken]

👍

[bobheadxi]

Ah, my bad - I think I did rebase the revert 😢 thanks! Unfortunately looks like it really threw off the contributor stats as well

Also, given this is a fairly sizeable update any chance we might get a shoutout on the sub again for some installs? 🙋‍♂️