Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: adamaflynn/MergingAssignment
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: gh-pages
Choose a base ref
...
head repository: haolinwolf/MergingAssignment
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: gh-pages
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 9, 2014

  1. Add Adam's name to the assignment (to cause a merge conflict)

    @adamaflynn
    adamaflynn committed Oct 9, 2014
    Configuration menu
    Copy the full SHA
    03f3351 View commit details
    Browse the repository at this point in the history

  2. Added my first name to index.html

    @haolinwolf
    haolinwolf committed Oct 9, 2014
    Configuration menu
    Copy the full SHA
    e7b50aa View commit details
    Browse the repository at this point in the history

  3. Fixing merge conflict

    @haolinwolf
    haolinwolf committed Oct 9, 2014
    Configuration menu
    Copy the full SHA
    7e2ef7f View commit details
    Browse the repository at this point in the history
Loading