fix(ci): stop skipping conflicts, and keep branches current - #129

fix(ci): stop skipping conflicts, and keep branches current#129

github-actions[bot] merged 1 commit into

mainbitbaum/botsmann:mainfrom

ci-merge-train-honestybitbaum/botsmann:ci-merge-train-honestyCopy head branch name to clipboard