Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

retract/recover gcode tuning script #574

Merged
merged 10 commits into from
Aug 19, 2024
Merged

Conversation

petaflot
Copy link
Contributor

@petaflot petaflot commented Aug 6, 2024

follow-up to #562 (comment)

URLs were fixed

@thisiskeithb
Copy link
Member

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

@petaflot
Copy link
Contributor Author

petaflot commented Aug 7, 2024

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)?

@petaflot
Copy link
Contributor Author

petaflot commented Aug 7, 2024

ps: I fully agree on the changes you have made :-)

@thisiskeithb
Copy link
Member

thisiskeithb commented Aug 7, 2024

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.

@thisiskeithb
Copy link
Member

@petaflot: It looks like you've undone some upstream changes & merged in changes from your other PR: #543, so this ends up changing a lot more than a single file.

@thinkyhead thinkyhead merged commit 8e4e4f2 into MarlinFirmware:master Aug 19, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants