gistfile1.txt

yatekii@arcturo:~/repos/probe-rs/cargo-embed$ git add .yatekii@arcturo:~/repos/probe-rs/cargo-embed$ git rebase --continue
Applying: Update the reset_and_halt call
No changes - did you forget to use 'git add'?
If there is nothing left to stage, chances are that something else
already introduced the same changes; you might want to skip this patch.

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

yatekii@arcturo:~/repos/probe-rs/cargo-embed$ git status
rebase in progress; onto 3929fcf
You are currently rebasing branch '0.8.0' on '3929fcf'.
  (all conflicts fixed: run "git rebase --continue")

nothing to commit, working tree clean