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: elaewin/CFuWx
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: elaewin/CFuWx
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: erica-conversionTests
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 4 commits
  • 11 files changed
  • 1 contributor

Commits on Dec 21, 2016

  1. fixing merge conflict on my machine with most recent merges from core… 

    …y and jake.
    @elaewin
    elaewin committed Dec 21, 2016
    Configuration menu
    Copy the full SHA
    4753b97 View commit details
    Browse the repository at this point in the history

  2. Changes from Jake's update of homeVC got overwritten by last merge fr… 

    …om Corey. Reproducing them on the HomeVC.
    @elaewin
    elaewin committed Dec 21, 2016
    Configuration menu
    Copy the full SHA
    691a4ce View commit details
    Browse the repository at this point in the history

  3. trying to fix merge conflict that is causing my build to fail.

    @elaewin
    elaewin committed Dec 21, 2016
    Configuration menu
    Copy the full SHA
    958eaa1 View commit details
    Browse the repository at this point in the history

  4. Still getting a "linker command failed with exit code 1" error that i… 

    …s causing my build to fail.
    @elaewin
    elaewin committed Dec 21, 2016
    Configuration menu
    Copy the full SHA
    b766cb4 View commit details
    Browse the repository at this point in the history
Loading