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
Fix Spelling Mistake in UBL's Mesh Status #6222
Conversation
As it turns out... an unsigned int can not go to less than 0, so the loop never terminates.
M421 was not connected up for AUTO_BED_LEVELING_BILINEAR. M421 needed to migrate mesh data to new UBL EEPROM layout.
Extra commits fell into this PR. Is this repo acting up again? |
This was done using GitHub-DeskTop. If I delete my copy of the repository and re-fork, I can start fresh. But there doesn't seem to be a way to take your local repository and start a Pull Request at a particular point in time. (Like after the last Pull Request) At least... I haven't figured it out yet. I did try doing those 'Tip of the Day' commands but they mangled my repository on my laptop. I think I was supposed to create a new directory and change-dir into it. I'm not sure what went wrong, but what I ended up with wasn't usable. If you look... The first commit was turned into a Pull Request and merged. The second commit was turned into a Pull Request and merged. And this is the third one. For some reason... Even though the previous stuff has been merged and a Sync done, it still wants to add that to the pull request. How big of a problem are these extra commits being tacked on? If they are a serious problem, I can delete my repository, re-fork, re-clone for each Pull Request. But if it is just a little bit of noise that can be ignored, it might be better to only delete, re-fork, re-clone every 3 or 4 Pull Requests. The one good thing is all of those commits deal with related topics. But they are logically separate. Your thoughts? |
Does that do what you want? |
I have the same trouble trying to squash. |
I was able to squash every time I tried it using @Bob-the-Kuhn 's directions. But I did run into some conflicts a few of those times. |
OK... I will try that! And I'm guessing I will need to give the branch a new name because there will already be a branch with the RCBugFix name, right? And I'm guessing that to create a pull request, I'll have to specify more stuff somewhere. Can you clear this up for me: I've been creating the pull requests from the GitHub web page for my repository. If I create a new branch, would I do it from the new branch's web page? |
Yes...new name based on the PR you want to submit. |
I did the power_supply_0, PR from the desktop. As just about all of my PR's. |
Choose a name that makes since to you. Like RCBugFix---UBL. |
I'm sure it won't go smoothly... I'll back up the whole directory before I start pressing buttons! |
That's the easy part for me. All back to where it was now. |
I followed the squash directions in Bob's dissertation. That works. But, the brute force method works too. You set the directory aside in a safe place. You delete your repository on GitHub. You re-fork. And then you just do visual diff of all the changes that appear between the two directories and get your changes into the new clone. It shouldn't be that hard... But that does work. |
LOL! That's what I was going to do (kind of) when everything stops changing with the wind. ;P |
The brute force squash of 59 commits was giving me soo many conficts. I can resolve conflicts in the desktop, but unsure where to correct conflicts that the rebase gives me. A lot of the commits are just updating from RCBugFix. |
That is where doing the visual diff of the two directories might make sense. You start with the current, already merged stuff. And then just decide what to do about each and every difference. I don't like the way Git litters the source file with all that <<<<<<HEAD and what ever markers. I don't want them messing with my source files. |
It does that when there is a conflict to resolve. |
Yes, but you are pointing right at github.com/MarlinFirmware/Marlin, right? I don't want to create a new branch there. I only want the new branch in my GitHub area. |
No. It created the branch in my repo FROM |
I can't show you more atm... I am at work now. |
Not a problem... This is enough I should be able to go through each step and figure things out. This was very helpful! UPDATE: Actually... I meant to say: This will be very helpful! Until I need to make another Pull Request, I won't go through the steps. But I will follow this path on the next one. |
Working on those videos now in earnest. |
No description provided.