Skip to content

Instantly share code, notes, and snippets.

@piferdg

piferdg/Advanced Git.md

Last active October 5, 2018 16:52
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save piferdg/74331a8df9f00ff6a324cc74e5afb396 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save piferdg/74331a8df9f00ff6a324cc74e5afb396 to your computer and use it in GitHub Desktop.
Download ZIP

Revisions

  1. piferdg renamed this gist Oct 5, 2018. 1 changed file with 0 additions and 0 deletions.
    0 gistfile1.txt → Advanced Git.md
    View file
    File renamed without changes.
  2. piferdg created this gist Oct 5, 2018.
    22 changes: 22 additions & 0 deletions gistfile1.txt
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,22 @@
    # Advanced Git

    The goal of this drill is to create a poem using a more advanced git workflow.

    - In your group, one person should create a git repository.
    - The rest of the members of your group should clone it onto their machine.

    - One person will create an index.html document with the basic parts of an html document in it.
    - Push that document up to the repo. Don't forget about remotes.
    - Everyone will pull that change down to their local repo.
    - Next person will create a feature branch
    ` git checkout -b branchname `
    - In that branch they will write the first line of the poem.
    - Add, commit and push to your branch, remember: git push remote branch
    - Submit a pull request from your branch to master branch
    - Merge that branch in
    - Repeat.
    - You can also add a styles.css document to style the text that you can all work on concurrently.

    ## Resuources
    - [Understanding GitHub Workflow](https://guides.github.com/introduction/flow/)
    - [Feature Branching Your Way to Greatness](https://www.atlassian.com/agile/software-development/branching)