Forking, pull requesting and merge conflicts

Jump to bottom Edit New page

Noon Silk edited this page Jul 18, 2014 · 2 revisions

find someone elses recipies repo; fork it, add a new recipie, and pull request this change to them. (you might like to rename their repo)

now i'll generate a merge conflict by changing something.

now we resolve the merge conflict via the command line.

"every morning when i wake up i experience an exquisite joy - the joy of being this footer."