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: pythonwood/HelloWorld
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9dd6d89
Choose a base ref
...
head repository: pythonwood/HelloWorld
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d8f8908
Choose a head ref
  • 10 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 29, 2013

  1. commit again in master for README changed to tell

    @pythonwood
    pythonwood committed Oct 29, 2013
    Configuration menu
    Copy the full SHA
    48f7798 View commit details
    Browse the repository at this point in the history

  2. for merge

    @pythonwood
    pythonwood committed Oct 29, 2013
    Configuration menu
    Copy the full SHA
    5ed072d View commit details
    Browse the repository at this point in the history

  3. merge-test change in master

    @pythonwood
    pythonwood committed Oct 29, 2013
    Configuration menu
    Copy the full SHA
    abf6402 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'merge1' in master after rebase test

    @pythonwood
    pythonwood committed Oct 29, 2013
    Configuration menu
    Copy the full SHA
    024dfab View commit details
    Browse the repository at this point in the history

  5. the same branch for merge2

    @pythonwood
    pythonwood committed Oct 29, 2013
    Configuration menu
    Copy the full SHA
    78a9729 View commit details
    Browse the repository at this point in the history

  6. in master the same branch for merge

    @pythonwood
    pythonwood committed Oct 29, 2013
    Configuration menu
    Copy the full SHA
    6cf8c6c View commit details
    Browse the repository at this point in the history

  7. Merge branch 'merge1' the 2st time

    @pythonwood
    pythonwood committed Oct 29, 2013
    Configuration menu
    Copy the full SHA
    16fc950 View commit details
    Browse the repository at this point in the history

  8. -for merge conflect:1-

    @pythonwood
    pythonwood committed Oct 29, 2013
    Configuration menu
    Copy the full SHA
    c68a901 View commit details
    Browse the repository at this point in the history

  9. -for merge conflect:2-

    @pythonwood
    pythonwood committed Oct 29, 2013
    Configuration menu
    Copy the full SHA
    cbdbf09 View commit details
    Browse the repository at this point in the history

  10. mergeconflect solove

    @pythonwood
    pythonwood committed Oct 29, 2013
    Configuration menu
    Copy the full SHA
    d8f8908 View commit details
    Browse the repository at this point in the history
Loading