diff --git a/gitBranches.md b/gitBranches.md index 9e670142906b559b5b71d0e76233074a1ab71c6d..5afd14af52f6703d7abb9f3660739ed2969f44a3 100644 --- a/gitBranches.md +++ b/gitBranches.md @@ -13,9 +13,9 @@ For this reason branches should be small small things that fix or make a specifi We have found the best workflow is to * [fork](https://happygitwithr.com/fork-and-clone.html) the original repo to your personal githib/gitlab account. This means you do not need to be a member of the original repo to work on it. It also helps to prevent accidents to the original master. - * add the original master as an [upstream remote](https://happygitwithr.com/upstream-changes.html) * create a new RStudio project using _your fork_ of the repo * It's possible you may need to set up a [new ssh key on github](https://happygitwithr.com/ssh-keys.html) to do this. What does this do? It tells github that the device you are using is authenticated. Tip: give the new SSH key on github a helpful name - e.g. the device it is associated with! + * add the original master as an [upstream remote](https://happygitwithr.com/upstream-changes.html) * **make a new branch in _your fork_ of the orginal repo**. Do some work, commit it locally. * when it works push your branch back up to the *original* repo * open a new pull request to merge your branch into the master