swcarpentry / git-novice

Version Control with Git

Home Page:http://swcarpentry.github.io/git-novice/

Geek Repo:Geek Repo

Github PK Tool:Github PK Tool

Introduce branching and pull requests in the "Collaborating" chapter

davidwilby opened this issue · comments

Unless I've missed it (highly possible) it seems that the lesson doesn't make a significant point of introducing a workflow that makes use of branches.

My first suggestion would be to introduce branching at the "Collaborating" stage, e.g. create a branch locally to make commits, push that branch to the remote and open a pull request, have the repo owner review and merge ready for both contributors to pull the repo.

Generally speaking I would always recommend this sort of workflow to researchers I mentor.

Happy to open a PR for this.

Thank you for the feedback. We acknowledge that there is more content in Carpentries lessons than can be taught in a typical workshop. It's one of the reasons maintainers are so aware of scope creep and extra time added in the main lesson.

Branches as an additional topic has been discussed many times, and in general are considered out of scope for a novice lesson. There is an issue (#827) left open to allow discussion of creating a second, more advanced lesson which would include working in depth with branches.

I'm going to close this as duplicative, but feel free to contribute to the discussion in #827