search

inib / Marlin

This marlin fork is used to keep track of the configs of my printers - use at own risk and check the wiki - if you have questions feel free to use the Issues tab
https://github.com/inib/Marlin/wiki
GNU General Public License v3.0
44 stars 18 forks source link

Merge to marlin 2.0 stable #13

Open porlock opened 4 years ago

porlock commented 4 years ago

Requirements

Fixing bugs

Description

Benefits

Fixing bugs

Related Issues

none

inib commented 4 years ago

I'll go for a restructure on the branches on Sunday. sorry for the delay, but I currently have very little spare time.

iamkarlson commented 4 years ago

whoa too many commits in here. @thinkyhead you're doing great stuff! did you test it on your machine? I see that you merged a lot of code from marlin repo but how stable is it? would you recommend code from this pull request for daily usage?

thinkyhead commented 4 years ago

The commits you see are not specifically recent, but are just a quirk of GitHub in the way it shows PRs that don't really fit together. Merge or rebase should be done between the relevant branches within your own workspaces, pulling from the various remotes as needed.

iamkarlson commented 4 years ago

@thinkyhead I understand this. I'm saying that you merging changes from MarlinFirmware:2.0.x here. Is it your workable solution? do you use it on your machine?

thinkyhead commented 4 years ago

I'm not merging anything here. This is a PR from user account @porlock targeting the @inib account's fork of Marlin.

iamkarlson commented 4 years ago

@thinkyhead probably it's confusing but what does that mean then?

@thinkyhead thinkyhead force-pushed the MarlinFirmware:2.0.x branch from f0f2725 to c352aeb 13 hours ago

Do you just pull changes from original marlin firmware?

thinkyhead commented 4 years ago

Possibly your fork (like mine) has been set up to automatically pull the latest changes through an action. Delete the .github/workflows/main.yml file from your repository on GitHub to prevent that possibility.