jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #326 from Pakketeretet2/github-tutorial-update 

Updated images of succesful merge.
This commit is contained in:
sjplimp 2017-01-17 09:03:46 -07:00 committed by GitHub
parent 5cd856c97f 20f8a8c219
commit c9bea60710
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
doc/src/JPG/tutorial_merged.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 57 KiB

After

Width:  |  Height:  |  Size: 25 KiB

BIN
doc/src/JPG/tutorial_reverse_pull_request7.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 25 KiB

5
doc/src/tutorial_github.txt
View File

@ -336,12 +336,15 @@ commit and push again:
$ git commit -m "Merged Axel's suggestions and updated text"
$ git push git@github.com:Pakketeretet2/lammps :pre
This merge also shows up on the lammps Github page:
:c,image(JPG/tutorial_reverse_pull_request7.png)
:line
[After a merge]
When everything is fine, the feature branch is merged into the master branch.
When everything is fine, the feature branch is merged into the master branch:
:c,image(JPG/tutorial_merged.png)