Skip to content

Commit

Permalink
update screenshot and split between pull request and merge
Browse files Browse the repository at this point in the history
  • Loading branch information
MalikaIhle committed May 28, 2024
1 parent 10fc3e0 commit e3c5fa4
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 5 deletions.
Binary file modified assets/create-pull-request.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/created-pull-request.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/pull-request-button.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/pull-request-message.png
Binary file not shown.
Binary file removed assets/pull-request-success.png
Binary file not shown.
13 changes: 8 additions & 5 deletions pull-request.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,20 @@

![](./assets/pull-request-button.png)

2. **GitHub**: **make sure the base repository is the LMU Open Science Center's original one and the head fork is yours**, both set on their main branch (these repositories should only have one branch anyway called 'main'. Branches are diverging versions of a file *within* a repository - we will not cover this concept today). Check that your requested merge does not create any conflict. If all is good, click on `Create pull request`
<br />


2. **GitHub**: **make sure the base repository is the LMU Open Science Center's original one and the head fork is yours**, both set on their main branch (these repositories should only have one branch anyway called 'main'. Branches are diverging versions of a file *within* a repository - we will not cover this concept today). Check that your requested merge does not create any conflict. In addition, **write an informative message**, explaining your changes to your collaborator, the author of the original repository. Click on `Create pull request`

![](./assets/create-pull-request.png)

3. **GitHub**: write an informative message, explaining your changes to your collaborator, the author of the original repository. Click on `Create pull request`
<br />


![](./assets/pull-request-message.png)
3. **GitHub**: you can now see a conversation tab around your pull request in the repository of the original owner:

4. **GitHub**: check to see your collaborator's response to your request and check the original repository to see your merged changes. Most likely it will be a thumbs up! But your collaborator might also **request a correction** if they spot an error. If this session is live: go see the instructor and ask them to watch while they merge your pull request.
<img src="assets/created-pull-request.png" width="550">

![](./assets/pull-request-success.png)

***

Expand Down

0 comments on commit e3c5fa4

Please sign in to comment.