admin2/template
1
0
Fork 0
mirror of https://github.com/TeachBooks/template.git synced 2026-11-13 14:45:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/main'

Browse source
This commit is contained in:
Tom van Woudenberg 2025-01-27 12:16:24 +01:00
commit 2fb3b561f3
8 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
book/exercises/005.md
View file

@ -4,7 +4,9 @@
In [](./004.md) you created your own version of a book. But it would be a pity if you never contribute back to the original book right? Probably your additions are very useful there too! You'll merge you version of the book which is stored on a branch into the original book which is on main. If there've been some changes on that main branch in the meantime, git will take care of that!
> Can you merge your branch into `main` with a pull request?
::::::{topic} Exercise objective
Can you merge your branch into `main` with a pull request?
::::::
1. Go to your repository homepage. Probably, it will have big yellow announcement saying {octicon}`git-branch;1em` `1-<your_issue_title> had recent pushes <some> minutes ago - Compare & Pull request`. We'll ignore that for now and do it manually.
2. Go to the pull request page on your repository homepage - {octicon}`git-pull-request;1em` and click `New pull request`