Updating from Upstream

FluentCV is the corporate-friendly fork of HackMyResume. This document describes how to apply upstream releases of HackMyResume to FluentCV, keeping the two projects synchronized.

1. These steps should be performed from a command line or shell in the local FluentCV folder, every time a new major or minor HackMyResume version is released.

2. Run git fetch hacksalot to fetch updates from hacksalot/HackMyResume.

3. Run git checkout master to switch to the master branch of FluentCV.

4. Run git merge hacksalot/master to merge the updates.

5. Resolve any merge conflicts. Run git status to view merge conflicts and git add or git rm to mark them resolved as usual. Most of these will boil down to renaming HackMyResume to FluentCV.

6. Run git commit -m "blah" to commit all changes.

7. Run git push --follow-tags to push updates to GitHub.

8. Copy release notes from each HackMyResume release to the corresponding FluentCV release, manually or with the help of a tool.

9. Run npm publish to update the FluentCV release on NPM.