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

Commits on Apr 11, 2018

  1. Basic archive conflict parsing - pass 1

    @Silarn
    Silarn committed Apr 11, 2018
    Configuration menu
    Copy the full SHA
    deaf512 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2018

  1. Merge fixes for archive parsing

    @Silarn
    Silarn committed Apr 12, 2018
    Configuration menu
    Copy the full SHA
    d860da0 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2018

  1. Basic archive conflict parsing - pass 1

    @Silarn
    Silarn committed Apr 17, 2018
    Configuration menu
    Copy the full SHA
    96e2511 View commit details
    Browse the repository at this point in the history

  2. Merge fixes for archive parsing

    @Silarn
    Silarn committed Apr 17, 2018
    Configuration menu
    Copy the full SHA
    8892903 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'mainline_dev' of https://github.com/Silarn/modorganizer … 

    …into mainline_dev
    @Silarn
    Silarn committed Apr 17, 2018
    Configuration menu
    Copy the full SHA
    6fded94 View commit details
    Browse the repository at this point in the history
Loading