Skip to content

Commit

Permalink
Merge pull request #1 from LCSB-BioCore/develop
Browse files Browse the repository at this point in the history
Regular merge of develop
  • Loading branch information
laurentheirendt authored Oct 7, 2019
2 parents df6051c + 183700a commit bfbe4b1
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<img src="assets/img/r3-training-logo.png" height="150px"/>
<img src="https://raw.githubusercontent.com/LCSB-BioCore/basic-git-practice/master/assets/img/r3-training-logo.png" height="150px"/>

# Advanced git course - Practice repository

First, fork and clone this practice repository.

Add a remote to the upstream repository:
```bash
$ cd advanced-practice
$ git remote add upstream ssh://git@git-r3lab-server.uni.lu:8022/R3/school/git/advanced-practice.git
$ git fetch
$ cd advanced-git-practice
$ git remote add upstream git@github.com:LCSB-BioCore/advanced-git-practice.git
$ git fetch upstream
```

Then, create a separate branch from the develop branch:
Expand All @@ -29,13 +29,13 @@ Once you are done committing, you can push your branch to your fork:
$ git push origin myBranch
```

## Open a merge request
## Open a pull request

If you now browse to your fork on Gitlab, you can open a pull request and submit it for review.
If you now browse to your fork, you can open a pull request and submit it for review.

: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,
and then push again. The pull-request will update automatically.
:warning: Watch out for comments from the reviewer! If there are things to be changed, change the files locally, commit,
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:
Binary file removed assets/img/r3-training-logo.png
Binary file not shown.

0 comments on commit bfbe4b1

Please sign in to comment.