Skip to content

Commit

Permalink
Use yaml titles
Browse files Browse the repository at this point in the history
  • Loading branch information
NeuroShepherd committed Sep 4, 2024
1 parent 0872263 commit 4742949
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 8 deletions.
4 changes: 3 additions & 1 deletion clone.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# Clone your GitHub repository
---
title: Clone your GitHub repository
---

***
1. **GitHub**: click on the green `<> Code` button, choose the **SSH** URL to secure your connection, and copy **your** repository's URL.
Expand Down
4 changes: 3 additions & 1 deletion commit.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# Commit changes locally
---
title: Commit changes locally
---

***
To avoid conflict during this collaborative coding exercice (i.e. contributors editing the same line of code at the same time), today, we will work on different files altogether. To avoid conflict in future projects, no tool will be able to replace good communication. However, GitHub offers tools to help that communication, called [GitHub issues](https://guides.github.com/features/issues/). And if need be, you could still [resolve conflicts using the command line](https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-using-the-command-line). Today, to avoid conflict, you will copy a template file and edit your own copy.
Expand Down
4 changes: 3 additions & 1 deletion fork.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# Fork a GitHub repository
---
title: Fork a GitHub repository
---

***
1. **GitHub**: go to [https://github.com/lmu-osc/Collaborative-RStudio-GitHub](https://github.com/lmu-osc/Collaborative-RStudio-GitHub).
Expand Down
4 changes: 3 additions & 1 deletion index.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# Collaborative coding with GitHub and RStudio
---
title: Collaborative coding with GitHub and RStudio
---

## About this work
This work was originally created by [Anna Krystalli](https://github.com/annakrystalli) from [RSE-Sheffield](https://github.com/RSE-Sheffield) under a [MIT licence](https://github.com/lmu-osc/Collaborative-RStudio-GitHub/blob/master/LICENSE) ([original repository](https://github.com/RSE-Sheffield/collaborative_github_exercise)). It was subsequently adapted by [Malika Ihle](https://ox.ukrn.org/people/#MalikaIhle) during her time at [Reproducible Research Oxford](https://ox.ukrn.org/), with the contributions of [Adam Kenny](https://github.com/Kennyanthro). It is now maintained by [Malika Ihle](https://www.osc.uni-muenchen.de/about_us/coordinator/index.html) at the [LMU Open Science Center](https://www.osc.uni-muenchen.de/index.html). The overview image is from [Dumitru Uzun](https://duzun.me/tips/git). The exercice is based on the [research](http://eprints.whiterose.ac.uk/99452/1/Bright%20et%20al.%202016_SelfArchive.pdf) of [Jen Bright](https://twitter.com/MorphobeakGeek) who also kindly provided the gifs used in the exercice. You are free to use, copy, modify, distribute this work for your own projects.
Expand Down
4 changes: 3 additions & 1 deletion merge.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# Observe the merged contributions
---
title: Observe the merged contributions
---

***

Expand Down
4 changes: 3 additions & 1 deletion pull-request.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# Create a pull request to ask your collaborator to merge your fork to the original repository
---
title: Create a pull request to ask your collaborator to merge your fork to the original repository
---

***

Expand Down
4 changes: 3 additions & 1 deletion pull-upstream.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# Pull upstream repository into your fork
---
title: Pull upstream repository into your fork
---

***

Expand Down
4 changes: 3 additions & 1 deletion push.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# Push your local changes to your remote repository
---
title: "Push your local changes to your remote repository"
---

***

Expand Down

0 comments on commit 4742949

Please sign in to comment.