Pulling code from CC and Sufia into Hyrax - samvera/hyrax GitHub Wiki

These are the steps for merging commits from Sufia and CurationConcerns into Hyrax.

Step 1 only needs to be done once.

1. Add Sufia (or CurationConcerns) as a remote to your local Hyrax repo: git remote add cc https://github.com/projecthydra/curation_concerns.git or git remote add sufia https://github.com/projecthydra/sufia.git
2. Fetch from the new remote: git fetch cc or git fetch sufia
3. Start a new branch for the merge: git checkout -b merge_cc or git checkout -b merge_sufia
4. Merge the latest commits into your branch: git merge cc/master or git merge sufia/master
5. Resolve any conflicts, keeping an eye out for references to CC or Sufia in the code or file paths, which you should change to Hyrax
6. Run the specs: rspec
7. Create a PR