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: peterbourgon/mergemap
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: wwalker/mergemap
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 5 commits
  • 3 files changed
  • 2 contributors

Commits on Dec 27, 2013

  1. Converted panic to an error 

    https://code.google.com/p/go-wiki/wiki/PanicAndRecover

By convention, no explicit panic() should be allowed to cross a package boundary. Indicating error conditions to callers should be done by returning error value.
    @or-else
    or-else committed Dec 27, 2013
    Configuration menu
    Copy the full SHA
    1588f66 View commit details
    Browse the repository at this point in the history

  2. Include error as the second return value

    @or-else
    or-else committed Dec 27, 2013
    Configuration menu
    Copy the full SHA
    e52f733 View commit details
    Browse the repository at this point in the history

  3. Updated test to accept returned error

    @or-else
    or-else committed Dec 27, 2013
    Configuration menu
    Copy the full SHA
    e1cd1b9 View commit details
    Browse the repository at this point in the history

  4. Update mergemap.go

    @or-else
    or-else committed Dec 27, 2013
    Configuration menu
    Copy the full SHA
    99a1184 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2015

  1. Add support for cases where the key of the map is of type interface{}

    Wayne Walker committed Dec 1, 2015
    Configuration menu
    Copy the full SHA
    54d71b4 View commit details
    Browse the repository at this point in the history
Loading