Updating from Upstream

FluentCV is the corporate-friendly fork of HackMyResume. For now, every HackMyResume release should be followed by an equivalent rebranded release of FluentCV. This document describes how to fetch, merge, and package that release.

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.

   1. 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.

   2. When all merge conflicts are resolved, or if there were no merge conflicts, go on to Step 5.

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