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: CSC207-2025F-UofT/lab2-branching-and-merging
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: amvipat/Lab2
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 12 commits
  • 3 files changed
  • 3 contributors

Commits on Sep 17, 2023

  1. Bob's version of the cake recipe added.

    @jcal13
    jcal13 committed Sep 17, 2023
    Configuration menu
    Copy the full SHA
    dafb661 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2024

  1. Merge branch 'main' into bob

    @jcal13
    jcal13 committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    7b4b550 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into bob

    @jcal13
    jcal13 committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    0055a02 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2024

  1. delete todo

    @randall-liao
    randall-liao committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    f83fa80 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from liaoyichen123/lab2_task1_dev 

    delete todo
    @randall-liao
    randall-liao authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    ee650d2 View commit details
    Browse the repository at this point in the history

  3. Checked off completed tasks

    @amvipat
    amvipat committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    af2c217 View commit details
    Browse the repository at this point in the history

  4. Completed TO DO task - changed type of s to long

    @amvipat
    amvipat committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    dc486f7 View commit details
    Browse the repository at this point in the history

  5. Checked off completed items

    @amvipat
    amvipat committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    52e28cd View commit details
    Browse the repository at this point in the history

  6. Checked off completed items

    @amvipat
    amvipat committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    a7cdb19 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/bob' into alice 

    # Conflicts:
#	recipe.md
    @amvipat
    amvipat committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    f4c67f7 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'alice'

    @amvipat
    amvipat committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    30219d6 View commit details
    Browse the repository at this point in the history

  9. Checked off completed items

    @amvipat
    amvipat committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    9237058 View commit details
    Browse the repository at this point in the history
Loading