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: jedbrown/git-tutorial
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a/dev
Choose a base ref
...
head repository: jedbrown/git-tutorial
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: integration
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 7 commits
  • 1 file changed
  • 3 contributors

Commits on Aug 6, 2014

  1. Merge branch 'a/dev' into integration 

    * a/dev:
  A: finish A
  A: incremental work
  A: start working
    @jedbrown
    jedbrown committed Aug 6, 2014
    Configuration menu
    Copy the full SHA
    4fa51c1 View commit details
    Browse the repository at this point in the history

  2. B: new table

    @jedbrown
    Bobby Tables authored and jedbrown committed Aug 6, 2014
    Configuration menu
    Copy the full SHA
    9d94b78 View commit details
    Browse the repository at this point in the history

  3. B: continue work on my own

    @jedbrown
    Bobby Tables authored and jedbrown committed Aug 6, 2014
    Configuration menu
    Copy the full SHA
    e0f0d86 View commit details
    Browse the repository at this point in the history

  4. B: make bug

    @jedbrown
    Charlie Cowboy authored and jedbrown committed Aug 6, 2014
    Configuration menu
    Copy the full SHA
    68c03ad View commit details
    Browse the repository at this point in the history

  5. B: ready to test

    @jedbrown
    Bobby Tables authored and jedbrown committed Aug 6, 2014
    Configuration menu
    Copy the full SHA
    d84a4ab View commit details
    Browse the repository at this point in the history

  6. Merge branch 'c/bug' into b/dev 

    Merge, fixing Charlie's bug.  We might normally ask him to fix himself.

* c/bug:
  B: make bug

Conflicts:
	b
    @jedbrown
    jedbrown committed Aug 6, 2014
    Configuration menu
    Copy the full SHA
    2fafd4f View commit details
    Browse the repository at this point in the history

  7. Merge branch 'b/dev' into integration 

    Merge completed bug-free feature.

* b/dev:
  B: ready to test
  B: make bug
  B: continue work on my own
  B: new table
    @jedbrown
    jedbrown committed Aug 6, 2014
    Configuration menu
    Copy the full SHA
    143f6ab View commit details
    Browse the repository at this point in the history
Loading