Merge branch 'end-user-training-fix' into 'master'

Fixed index layout and end user training layout

Some fixes to the index layout and the user training.

See merge request !45

README.md

@@ -4,6 +4,19 @@ This repository contains documents related to GitLab University.
 For most information, see [the website](https://university.gitlab.com/).
-## Viewing Slides
-Use [Deckset](http://www.decksetapp.com/) to view the slides in a nice way.
+## Local development
+```
+bundle install
+
+bundle exec middleman
+```
+
+Once the Middleman server is running, you can visit 
+`http://localhost:4567/` in your browser to see a live, local preview of 
+the site. Any changes to files in the `source` directory will be detected 
+automatically, and your browser will even reload the page if necessary.
+PDF files are not available in development mode. See below for more 
+information. See the 
+[Middleman](https://middlemanapp.com/basics/development_cycle/) docs for 
+more information
\ No newline at end of file

source/index.html.md

@@ -10,12 +10,6 @@ _University materials don't replace our [Documentation](http://docs.gitlab.com)
 ---
-### Other pages
-
-+ [Trainings](/training)
-+ Bootcamp
-    + [Support](/support)
-
 ### On this page
 + [GITx] Git
@@ -29,6 +23,7 @@ _University materials don't replace our [Documentation](http://docs.gitlab.com)
 + [COM] Competition comparison
 + [SPTx] Support Bootcamp
 + [SLSx] Sales Bootcamp
++ [TRAx] Trainings 
 ---
@@ -78,8 +73,7 @@ _University materials don't replace our [Documentation](http://docs.gitlab.com)
 ---
 + [GCI1] [GitLab CI product page](https://about.gitlab.com/gitlab-ci/)
-+ [GCI2] [Continuous Delivery vs Continuous Deployment](https://www.youtube.com/watch?v=igwFj8PPSnw) - ER
-+ [GCI3] [Setting up GitLab Runner For Continuous Integration](https://about.gitlab.com/2016/03/01/gitlab-runner-with-docker/)
++ [GCI2] [Setting up GitLab Runner For Continuous Integration](https://about.gitlab.com/2016/03/01/gitlab-runner-with-docker/)
 ---
@@ -97,7 +91,7 @@ _University materials don't replace our [Documentation](http://docs.gitlab.com)
 ---
 + [SPT1] [Support Path](/support/)
-+ [SPT2] [End User Training](https://gitlab.com/gitlab-org/University/blob/master/training/user_training.md)
++ [SPT2] [End User Training Material](https://gitlab.com/gitlab-org/University/blob/master/training/user_training.md)
 + [SPT3] [Materials for Training Sessions](https://gitlab.com/gitlab-org/University/tree/master/training/topics)
 ---
@@ -107,6 +101,10 @@ _University materials don't replace our [Documentation](http://docs.gitlab.com)
 ---
++ [TRA1] [End User Training](/training/end-user/)
+
+---
+
 ### External Resources
 + [DOC] GitLab Documentation
@@ -131,6 +129,7 @@ _University materials don't replace our [Documentation](http://docs.gitlab.com)
 + Others (not created by GitLab)
   + [Dev Ops terminology](https://xebialabs.com/glossary/)
+  + [CI vs CD] [Continuous Delivery vs Continuous Deployment](https://www.youtube.com/watch?v=igwFj8PPSnw)
   + [Periodic Table of DevOps Tools](https://xebialabs.com/periodic-table-of-devops-tools/)
   + [State of Dev Ops 2015 Report by Puppet Labs](https://puppetlabs.com/sites/default/files/2015-state-of-devops-report.pdf) Insightful Chapters to understand the Impact of Continuous Delivery on Performance (Chapter 4), the Application Architecture (Chapter 5) and How IT Managers can help their teams win (Chapter 6).
   + [2011 WSJ article by Mark Andreeson - Software is Eating the World](http://www.wsj.com/articles/SB10001424053111903480904576512250915629460)

source/training/end-user/index.html.md

@@ -2,6 +2,13 @@
 title: Trainings
 ----------------
+This training material is the markdown used to generate training slides 
+which can be found at [End User Slides](http://45.55.216.78:8000/#/) 
+through it's [RevealJS](https://gitlab.com/gitlab-org/end-user-training-slides) 
+project.
+
+---
+
 ## Git Intro
 ---
@@ -227,12 +234,182 @@ git push origin squash_some_bugs
 ---
+## Merge Conflicts
+
+---
+
+### Merge Conflicts
+* Happen often
+* Learning to fix conflicts is hard
+* Practice makes perfect
+* Force push after fixing conflicts. Be careful!
+
+--- 
+
+### Example Plan
+1. Checkout a new branch and edit conflicts.rb. Add 'Line4' and 'Line5'.
+2. Commit and push
+3. Checkout master and edit conflicts.rb. Add 'Line6' and 'Line7' below 'Line3'.
+4. Commit and push to master
+5. Create a merge request and watch it fail
+6. Rebase our new branch with master
+7. Fix conflicts on the conflicts.rb file.
+8. Stage the file and continue rebasing
+9. Force push the changes
+10. Finally continue with the Merge Request
+
+--- 
+
+### Example 1/2
+
+    git checkout -b conflicts_branch
+    
+    # vi conflicts.rb
+    # Add 'Line4' and 'Line5'
+    
+    git commit -am "add line4 and line5"
+    git push origin conflicts_branch
+    
+    git checkout master
+    
+    # vi conflicts.rb
+    # Add 'Line6' and 'Line7'
+    git commit -am "add line6 and line7"
+    git push origin master 
+
+--- 
+
+### Example 2/2
+
+Create a merge request on the GitLab web UI. You'll see a conflict warning.
+
+    git checkout conflicts_branch
+    git fetch
+    git rebase master
+    
+    # Fix conflicts by editing the files.
+    
+    git add conflicts.rb
+    # No need to commit this file
+    
+    git rebase --continue
+    
+    # Remember that we have rewritten our commit history so we
+    # need to force push so that our remote branch is restructured
+    git push origin conflicts_branch -f
+
+--- 
+
+### Notes
+
+* When to use `git merge` and when to use `git rebase`
+* Rebase when updating your branch with master
+* Merge when bringing changes from feature to master
+* Reference: https://www.atlassian.com/git/tutorials/merging-vs-rebasing/
+
+--- 
+
+## Revert and Unstage
+
+--- 
+
+### Unstage
+
+To remove files from stage use reset HEAD. Where HEAD is the last commit of the current branch.
+
+    git reset HEAD <file>
+
+This will unstage the file but maintain the modifications. To revert the file back to the state it was in before the changes we can use:
+
+    git checkout -- <file>
+    
+To remove a file from disk and repo use 'git rm' and to rm a dir use the '-r' flag.
+
+    git rm '*.txt'
+    git rm -r <dirname>
+    
+If we want to remove a file from the repository but keep it on disk, say we forgot to add it to our .gitignore file then use --cache.
+ 
+    git rm <filename> --cache
+
+--- 
+
+### Undo Commits
+
+Undo last commit putting everything back into the staging area.
+ 
+    git reset --soft HEAD^
+    
+Add files and change message with:
+ 
+    git commit --amend -m "New Message"
+    
+Undo last and remove changes 
+
+    git reset --hard HEAD^
+    
+Same as last one but for two commits back
+ 
+    git reset --hard HEAD^^
+    
+Don't reset after pushing
+
+--- 
+
+### Reset Workflow
+
+1. Edit file again 'edit_this_file.rb'
+2. Check status
+3. Add and commit with wrong message
+4. Check log
+5. Amend commit
+6. Check log
+7. Soft reset
+8. Check log
+9. Pull for updates
+10. Push changes
+
+---- 
+
+    # Change file edit_this_file.rb
+    git status
+    git commit -am "kjkfjkg"
+    git log
+    git commit --amend -m "New comment added"
+    git log
+    git reset --soft HEAD^
+    git log
+    git pull origin master
+    git push origin master
+
+--- 
+
+### Note
+
+git revert vs git reset  
+Reset removes the commit while revert removes the changes but leaves the commit  
+Revert is safer considering we can revert a revert  
+
+
+    # Changed file
+    git commit -am "bug introduced"
+    git revert HEAD
+    # New commit created reverting changes
+    # Now we want to re apply the reverted commit
+    git log # take hash from the revert commit
+    git revert <rev commit hash>
+    # reverted commit is back (new commit created again)
+
+---
+
 ## Questions
 ---
 ## Instructor Notes
+--- 
+
 ### Version Control
  - Local VCS was used with a filesystem or a simple db.
  - Centralized VCS such as Subversion includes collaboration but

source/training/index.html.md

----
-title: Trainings
-----------------
-
-## What are GitLab Trainings
-
-This section hosts all training material used for our [training sessions](https://about.gitlab.com/training/). 
-
----
-
-+ [End User Training](/training/end-user)
-+ [End User Training Slides](http://45.55.216.78:8000/#/)
\ No newline at end of file