git_training

Author	SHA1	Message	Date
Patrick Pichler	aeec4a1391	Add missing switch back to master branch In the `Merging divergent branches` section it is stated to merge the `change_alice` branch into the `change_alice` branch. This makes no sense and the accompanying picture tells a different story. In reality the `change_alice` branch should be merged into master. This is now fixed.	6 years ago
ziga	aeafd763bd	Fix two typos	6 years ago
Jesse	ab33865d31	Fix typo in README	6 years ago
UnseenWizzard	2c9dc834f1	Correctly use its and it's - Thanks Jon Forrest	6 years ago
UnseenWizzard	bbfdeaaccc	Fix merge abort command being wrong - Thanks Fersu	6 years ago
UnseenWizzard	586efd2167	Add Alice	6 years ago
Nico Riedmann	3e4e4e57ce	Add Tutorial Text Changes to the tutorial are all squashed into this commit on master, to keep the log free of clutter that distracts from the tutorial See the tutorial_wip branch for the actual commit history	6 years ago