Este directorio sirve de ayuda para experimentar el uso de git.
This changes made in branch-stash: from http://codehero.co/rebase-y-stash/ codehero.co/series/git-desde-cero](http://codehero.co/series/git-desde-cero/
Some more text to test
After merge conflicts here are the two lines, i will add and commit this files to the merge take effect. This text was included on master branch. to test merge with a modified README from a branch This text is being created in test-0 branch, to test marge with a modified README from master on a newer HEAD version.
And a change in master to create a conflict on merge
again, changes in branch test-1