Closed petaflot closed 3 months ago
I've rebased this PR to bring it up to date with current master
& resolved merge conflicts, so please update your local copy with the following before pushing additional commits:
git checkout jczd
git fetch origin
git reset --hard origin/jczd
I've rebased this PR to bring it up to date with current
master
& resolved merge conflicts, so please update your local copy with the following before pushing additional commits:git checkout jczd git fetch origin git reset --hard origin/jczd
thanks a lot, @thisiskeithb
unfortunately I have a problem here...
$ git reset --hard origin/jczd
fatal: ambiguous argument 'origin/jczd': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
maybe you can help (again)?
ps: I fully agree on the changes you have made :-)
maybe you can help (again)?
If you were able to run the previous two commands, then git reset --hard origin/jczd
should have worked. I just tested it on my machine (using the petaflot
remote instead of origin
) and it worked 🤷
What does git remote -v
report?
edit: I also fixed some typos & punctuation in a3e046c.
@petaflot: It looks like you've undone some upstream changes & merged in changes from your other PR: https://github.com/MarlinFirmware/MarlinDocumentation/pull/543, so this ends up changing a lot more than a single file.
follow-up to https://github.com/MarlinFirmware/MarlinDocumentation/pull/562#issuecomment-2271483980
URLs were fixed