From 0165155dae70d0f559b8e32988f7bde5ff495288 Mon Sep 17 00:00:00 2001 From: Quentin Grimonprez Date: Fri, 3 Sep 2021 14:47:15 +0200 Subject: [PATCH 1/2] add a conflict slide --- deck.mdx | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/deck.mdx b/deck.mdx index a48a567..be86264 100644 --- a/deck.mdx +++ b/deck.mdx @@ -291,3 +291,14 @@ git rebase -i __What’s happening__: `-i` puts rebase in “interactive mode”. It starts off like the rebase discussed above, but before replaying any commits, it pauses and allows you to gently modify each commit as it’s replayed. + +--- + +## How to deal with conflicts + +Let's generate some conflicts + + + + + From 700d21043f9d950a67b1ae4950ef983231c5840c Mon Sep 17 00:00:00 2001 From: Quentin Grimonprez Date: Fri, 3 Sep 2021 15:07:36 +0200 Subject: [PATCH 2/2] add linter workflow --- .github/workflows/linter.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/linter.yml diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml new file mode 100644 index 0000000..787c6a9 --- /dev/null +++ b/.github/workflows/linter.yml @@ -0,0 +1,25 @@ +name: Linter + +# Run this workflow every time a new commit pushed to your repository +on: push + +jobs: + # Set the job key. The key is displayed as the job name + # when a job name is not provided + super-lint: + # Name the Job + name: Lint code base + # Set the type of machine to run on + runs-on: ubuntu-latest + + steps: + # Checks out a copy of your repository on the ubuntu-latest machine + - name: Checkout code + uses: actions/checkout@v2 + + # Runs the Super-Linter action + - name: Run Super-Linter + uses: github/super-linter@v3 + env: + DEFAULT_BRANCH: main + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}