DirectEmployers/MyJobs — pull request #861 by aspidites (2014-09-08 14:00:51+00:00)
Title: Merge without activation changes

One last try at a merge branch. While the previous iteration of this branch effectively removed the commits that introduced breaking changes to the account activation flow, this one just adds a commit that ensures those changes are undone. The difference being that because ignoring those commits isn't seen as a merge conflict, they would have been re-introduced at merge time. The only way around this would have been to rename the merge branch as master.

While I don't think that would have caused any later issues, I figured doing things this way would be less of a nuisance to other developers since it's just a click of a button, though it was certainly more tedious to work out, since I had to manually go through each commit, see what files were changed, and make sure that by reintroducing the old files I didn't clobber intentional edits.