diff --git a/Instructions.txt b/Instructions.txt index a68d3c3d18f3579b05c0fe4e8b1fc60952076756..4a8b046bda1461d72bd34f681d19840fa702e81d 100644 --- a/Instructions.txt +++ b/Instructions.txt @@ -22,5 +22,11 @@ git pull --rebase git checkout - git rebase main +man kann auch brauchen: + +solve the conflict +git add <file name of conflict> +git rebase --continue +git push --force Please try out these commands asap!