search

htw-imi-showtime / showtime-website

The official IMI showtime website
10 stars 104 forks source link

Tech Stack picture Fix #271

Closed MirijamTrippel closed 1 year ago

MirijamTrippel commented 1 year ago

Tech Stack Picture Fix

MirijamTrippel commented 1 year ago

Hello, we just noticed that under the Techstack tab, the filename had to be changed from "Techstack-Gitlab-logo.svg" -> "Techstack-Gitlab-logo.png" under the Project management category, that file went somehow under the radar

bkleinen commented 1 year ago

Conflicting files content/archive themes/showtime-theme-2021 did you mean to change the submodules? also, content/archive is old. You need to merge main from here obviously.

git submodule update

and commited the old versions?

they need to be on these commits:

git submodule status 1ead3295b62b866f4a65a151b8212a4538adb6d5 project-archive (v0.1.2) 3f41790ac890ead3d2eb67475a00a609333cff52 themes/showtime-theme-2021 (2023.1.1-16-g3f41790)

MirijamTrippel commented 1 year ago

The git submodule update did not change anything, I couldnt merge the htw-website main in my website-main without solving the conflicts, i had to discard all commits and synch the fork, then apply the suffix change to png