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: alxhoff/git-tutorial
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: lukakeso/git-tutorial
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.
  • 19 commits
  • 22 files changed
  • 2 contributors

Commits on Apr 14, 2020

  1. CMakeLists for a basic C project

    @alxhoff
    alxhoff committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    665a119 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2020

  1. README for dealing with merge conflicts

    @alxhoff
    alxhoff committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    61d4e01 View commit details
    Browse the repository at this point in the history

  2. State machine not building, needs fixes

    @alxhoff
    alxhoff committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    44f8886 View commit details
    Browse the repository at this point in the history

  3. Engineer no#2's error fixes

    @alxhoff
    alxhoff committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    917bdab View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2020

  1. Added all the files from CMake

    @ge97qir
    ge97qir committed Apr 25, 2020
    Configuration menu
    Copy the full SHA
    a31e759 View commit details
    Browse the repository at this point in the history

  2. Actualising .gitignore

    @ge97qir
    ge97qir committed Apr 25, 2020
    Configuration menu
    Copy the full SHA
    f14afc4 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2020

  1. Added bin, include and src directories

    @ge97qir
    ge97qir committed Apr 30, 2020
    Configuration menu
    Copy the full SHA
    32caf65 View commit details
    Browse the repository at this point in the history

  2. Implementing a hello.c file as a new feature

    @ge97qir
    ge97qir committed Apr 30, 2020
    Configuration menu
    Copy the full SHA
    392ddf5 View commit details
    Browse the repository at this point in the history

  3. Moved the hello.c file to src directory so cmake can see it.

    @ge97qir
    ge97qir committed Apr 30, 2020
    Configuration menu
    Copy the full SHA
    67b0bbe View commit details
    Browse the repository at this point in the history

  4. Commiting again since I did not manually remove the hello.c and just … 

    …used the mv command thus the old file location was not staged for commit.
    @ge97qir
    ge97qir committed Apr 30, 2020
    Configuration menu
    Copy the full SHA
    9386bb3 View commit details
    Browse the repository at this point in the history

  5. Updated .gitignore to include bin directory.

    @ge97qir
    ge97qir committed Apr 30, 2020
    Configuration menu
    Copy the full SHA
    7c4d4a4 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2020

  1. The ESPL library

    @alxhoff @ge97qir
    alxhoff authored and ge97qir committed May 1, 2020
    Configuration menu
    Copy the full SHA
    f1f01d4 View commit details
    Browse the repository at this point in the history

  2. CMakeLists patch to include, build and link ESPL library

    @alxhoff @ge97qir
    alxhoff authored and ge97qir committed May 1, 2020
    Configuration menu
    Copy the full SHA
    99a7e6c View commit details
    Browse the repository at this point in the history

  3. Instructions on how to continue

    @alxhoff @ge97qir
    alxhoff authored and ge97qir committed May 1, 2020
    Configuration menu
    Copy the full SHA
    6bab39b View commit details
    Browse the repository at this point in the history

  4. Implemented a patch to CMakeLists.txt, added a .patch file for the ma… 

    …in function (part of the exercise) and completed the Coding Challenge 2.
    @ge97qir
    ge97qir committed May 1, 2020
    Configuration menu
    Copy the full SHA
    ded33a5 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2020

  1. Completed Coding Challenge 2, changing the main.c, main.h and my_stat… 

    …es.c
    @alxhoff @ge97qir
    alxhoff authored and ge97qir committed May 2, 2020
    Configuration menu
    Copy the full SHA
    fd00497 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'conflicts' into merging

    @ge97qir
    ge97qir committed May 2, 2020
    Configuration menu
    Copy the full SHA
    eaf65ee View commit details
    Browse the repository at this point in the history

Commits on May 27, 2020

  1. cleaned the src folder so the programm now builds normally

    @ge97qir
    ge97qir committed May 27, 2020
    Configuration menu
    Copy the full SHA
    18b4e0f View commit details
    Browse the repository at this point in the history

  2. added a username text file for git

    @ge97qir
    ge97qir committed May 27, 2020
    Configuration menu
    Copy the full SHA
    a870e86 View commit details
    Browse the repository at this point in the history
Loading