🔜 eth0
@jeder@miau.jeder.pl
🔜 eth0
@jeder@miau.jeder.pl
🔜 eth0
@jeder@miau.jeder.pl
🔜 eth0
@jeder@miau.jeder.pl
🔜 eth0
@jeder@miau.jeder.plgit reset --hard origin/main instead of git pull --ff since otherwise you get a huge merge conflictgit pull -ff you start a merge. You don't want to merge the Calckey codebase with the FoundKey codebase, that would be stupid.reset hard does.
🔜 eth0
@jeder@miau.jeder.plgit pull --ff in the migration guide which is pretty much misleading
git pull --ff which is probably a mistake.
🔜 eth0
@jeder@miau.jeder.pl