Figure out which is better for this repo at this step. Rebase or merge.

[JamieBort]

See step 9 of https://github.com/JamieBort/Learning-Directory/tree/master/Meta#git-workflow

and

https://github.com/JamieBort/Learning-Directory/tree/master/Git/git_workflow#resources-to-explore

and maybe this

https://github.com/JamieBort/Learning-Directory/tree/master/Git/git_workflow#git-workflow-for-my-repos

too.

Associated

Issues

#251