Skip to content

Commit

Permalink
Merge pull request #83 from MetOffice/git-tutorial-fix
Browse files Browse the repository at this point in the history
Fix link to Git tutorial
  • Loading branch information
jfrost-mo authored Mar 23, 2023
2 parents ad13e8d + cac4546 commit 13c4564
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions docs/source/working-practices/git.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ functionality built into many IDEs, such as VSCode or PyCharm. As you get
started with git on the command line, you may find this `git cheat sheet`_
helpful.

.. _git and GitHub tutorial: https://glfmn.github.io/gh-slides/
.. _git and GitHub tutorial: https://aaronosher.io/github-workshop/
.. _GitHub flow: https://docs.github.com/en/get-started/quickstart/github-flow
.. _good commit messages: https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
.. _git cheat sheet: https://education.github.com/git-cheat-sheet-education.pdf
Expand Down Expand Up @@ -164,6 +164,6 @@ a conflict and often occurs if you have changed a line that was also changed in
the other branch. Git will stop and let you manually fix it. Read the
`documentation on fixing merge conflicts`_ to find out how.

.. _these slides: https://glfmn.github.io/gh-slides/#/rebase
.. _these slides: https://aaronosher.io/github-workshop/#/rebase
.. _official documentation on rebase: https://git-scm.com/book/en/v2/Git-Branching-Rebasing
.. _documentation on fixing merge conflicts: https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging#_basic_merge_conflicts

0 comments on commit 13c4564

Please # to comment.