jse-git-workflow-demo Simple demo of git workflow and merge collision resolution Beta wants the file to look like this! Here is a line addded by Alpha. I am the best!!! This code is superior. I am ALPHA! I rULE!