Verified Commit 96de4392 authored by Laurent Heirendt's avatar Laurent Heirendt
Browse files

changes to readme

parent 27674d4f
...@@ -2,22 +2,25 @@ ...@@ -2,22 +2,25 @@
# Advanced git course - Practice repository # Advanced git course - Practice repository
## Make your changes First, fork and clone this practice repository.
Copy the file `template.md` in the folder `_attendees` and rename it with your firstname:
Add a remote to the upstream repository:
```bash ```bash
$ cd _attendees $ cd advanced-practice
$ cp template.md myName.md $ git remote add upstream ssh://git@git-r3lab-server.uni.lu:8022/R3/school/git/advanced-practice.git
$ git fetch
``` ```
Then, make your changes with your favorite editor! Then, create a separate branch from the develop branch:
```bash
$ git checkout -b myBranch upstream/develop
```
## Commit your changes and push Add your name file in the `attendees` directory:
When you are done editing your file, add the file to the stage and commit it: When you are done editing your file, add the file to the stage and commit it:
```bash ```bash
$ git add myName.md $ git add attendees/myName.md
$ git commit -m "Edit the content of the subpage myName.md" $ git commit -m "Edit the content of the subpage myName.md"
``` ```
...@@ -26,13 +29,13 @@ Once you are done committing, you can push your branch to your fork: ...@@ -26,13 +29,13 @@ Once you are done committing, you can push your branch to your fork:
$ git push origin myBranch $ git push origin myBranch
``` ```
## Open a pull-request ## Open a merge request
If you now browse to your fork on Github, you can open a pull request and submit it for review. If you now browse to your fork on Gitlab, you can open a pull request and submit it for review.
:warning: Please make sure to select `develop` as the target branch. :warning: Please make sure to select `develop` as the target branch.
:warning: Watch out for comments from the reviewer! If there are things to be changed, simply change locally, commit, :warning: Watch out for comments from the reviewer! If there are things to be changed, simply change locally, commit,
and then push again. The pull-request will update automatically. and then push again. The pull-request will update automatically.
Once the pull request has been accepted, you will be able to see your page online! :tada: Once the pull request has been accepted, you will be able to see your page online! :tada:
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment