README.md 900 Bytes
Newer Older
Whitney Armstrong's avatar
Whitney Armstrong committed
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35
Git Challenge
=============

A low pressure way to get familiarized with git.

The Challenges
--------------

### Level : easy
1. Fork this repository.
2. In a single commit, add a file with your name as the title in the "names" 
   directory.
3. In another commit, edit this file (README.md) and add your name to the list 
   below.
4. Create a *merge request* for your changes.

### Level : moderate
1. Create a new branch (called whatever you want)
2. Commit some changes to your file (however you want).
3. Submit a merge request from this branch (hint: the branch name should not be 
   named "master"). 

### Level : expert

1. Create a merge  conflict between your two branches.
2. Submit a merge request for this resolved conflict's commit.

### Level : impossible

1. Try to get me to merge a second item to this list. Hint: I won't :)

Name List
---------

- Whit
David Blyth's avatar
David Blyth committed
36
- David
sjohnston's avatar
sjohnston committed
37
- Sereres
Whitney Armstrong's avatar
Whitney Armstrong committed
38 39 40 41 42 43 44 45