ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged Axel's suggestions and updated text

Browse Source
This commit is contained in:
Stefan Paquay
2017-01-06 11:51:42 +01:00
parent 958722573f
commit 4d0a6d83bd
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
doc/src/tutorial_github.txt
View File

@ -283,7 +283,19 @@ Axel's change back into our branch, and merge them:
$ git add tutorial_github.txt
$ git add JPG/tutorial_reverse_pull_request*.png
$ git commit -m "Updated text and images on reverse pull requests"
$ git pull
$ git pull :pre
In this case, the merge was painless because github could auto-merge:
:c,image(JPG/tutorial_reverse_pull_request6.png)
With Axel's changes merged in and some final text updates, our feature branch is
now perfect as far as we are concerned, so we are going to commit and push again:
$ git add tutorial_github.txt
$ git add JPG/tutorial_reverse_pull_request6.png
$ git commit -m "Merged Axel's suggestions and updated text"
$ git push git@github.com:Pakketeretet2/lammps :pre
:line