prg-titech / Kanon

A live programming environment specialized for data structure programming.
https://prg-titech.github.io/Kanon/
MIT License
68 stars 4 forks source link

conflict in gh-pages #43

Open masuhar opened 2 years ago

masuhar commented 2 years ago

When the master branch is updated, all we need to do is to

  1. checkout gh-pages
  2. merge origin:master, and
  3. push

to get installed the latest version on the web version. However, sometimes we experience conflicts at the second step, which might need to be examined. (We need a reproducable way .)