Investigate lost commits after rebasing refactor branch

[miketaylr]

@zoepage said the current refactor branch (which is on staging) is missing commits, or had some bad rebase side effects.

Ola, can you point us to what is wrong, so we can document it here?

[miketaylr]

oklay, staging is broken. so please don't check :D I'll fix it up and send a PR so we can deploy on monday. :)
It contains merge conflicts

Current refactor doesn't contain any instances of <<<<, etc. so I think @zoepage is referring to something else, possibly the wrong commit was merged in during rebase.

edit: Just chatted with Ola, and she suspects there are a big number of commits that were skipped or are missing in the rebased refactor branch. She's working on a PR to fix that. 🎉

[miketaylr]

Here's one instance where we have double content now:

https://github.com/webcompat/webcompat.com/blob/refactor/tests/unit/test_urls.py#L95

[miketaylr]

An instance of a commit missing: https://github.com/webcompat/webcompat.com/blob/refactor/webcompat/templates/contributors/diagnose-bug.html

877cc6e#diff-8116a591f9d9414310575c05ce0e828a

[zoepage]

@miketaylr we can close this, right?

[zoepage]

merged #2297