Plan
2019-06-21 Edit

How to update Precis?

Add upstream remote

Add the Precis repository as remote named upstream

git  remote add upstream git@github.com:abhin4v/precis.git

Cherry-pick multiple

Find what is the first commit your repository is missing aaaa and last commit bbbb Cherry pick multiple commits

git cherry-pick aaaa^..bbbb

Commit an empty conflict resolve

If fixing one of the conflict leads to an empty commit (a commit without files), you can force the commit by using the parameter

git commit --allow-empty