Test rebasing

[micahflee]

The first release is based on Signal Desktop 7.86.0. Yesterday 7.87.0 was released, so I should try rebasing to see how hard it is.

https://github.com/signalapp/Signal-Desktop/releases/tag/v7.87.0

[micahflee]

I think it makes more sense to merge than to rebase. Here's how to do it:

# Make sure to add the upstream remote, if it's not already there
git remote add upstream https://github.com/signalapp/Signal-Desktop.git

# Fetch the upstream tags
git fetch upstream

# Merge the release tag into the current branch
git merge v7.87.0

# Resolve all the merge conflicts -- there were 84 conflicts

[micahflee]

Fixed in #24