How to get latest slate - AbirRazzak/startbootstrap-resume GitHub Wiki

In this repo, our upstream branch is the fork of [email protected]:slatedocs/slate.git. Before we can update our master docs, we must update upstream.

git remote add upstream [email protected]:slatedocs/slate.git
git fetch --multiple origin upstream --tags
git checkout -b update-upstream origin/upstream
git merge upstream/<tag>   # For example, latest tag as of today was "v2.7.0".
git push -u origin update-upstream

From here, PR update-upstream into master and merge when reviewed.

git checkout -b update-slate origin/master
git merge origin/upstream

That final git merge should likely result in a lot of conflicts. You'll need to use your best judgement here. For the most part, you'll want to take THEIRS on all changes. There are some exceptions:

  • Things in /.github/ have been removed. This included some build specific workflows or PR templates. We don't want that.
  • We have some custom html/css in layout.erb and screen.css.scss. Be careful to not lose those changes.
  • Our README.md replaces theirs.

Before committing, I recommend you test things locally. Specifically look for new pages that may have been added upstream that we do not want, or perhaps things that just look wrong due to a bad merge.

If things look good, commit the merge, push to github, and PR to master.

⚠️ **GitHub.com Fallback** ⚠️