-
Notifications
You must be signed in to change notification settings - Fork 1
Description
This repository is forked at https://github.com/CrisisTextLine/modular
Pull in the latest changes from that fork. Make sure references to CrisisTextLine are replaced with GoCodeAlone.
Check for conflicts, handle merge conflicts by examining changes between both repositories and taking the changes that make sense to keep. Then recheck for remaining conflicts.
Run all tests, ensure all examples work, ensure no regressions or remaining merge conflicts.
The last commit in our history where we merged from CrisisTextLine recently, was our commit hash 0373bce, in case that helps for determining what's changed.
When merging, do not use a git strategy of "ours" or "theirs", rather inspect the actual changes. Still have a preference for our changes, as we introduced a lot of functionality and stability supporting changes within the repo. Just preserve the obvious improvements from the downstream repo.