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

Merge back the planar feature to the mainline #14

Open
TQwan opened this issue Sep 28, 2019 · 2 comments
Open

Merge back the planar feature to the mainline #14

TQwan opened this issue Sep 28, 2019 · 2 comments

Comments

@TQwan
Copy link

TQwan commented Sep 28, 2019

Hi,
I don't know if you were aware of this, but there is a pull request to merge back the planar feature to the mainline.
slic3r#4864
They try to merge in your code to the mainline, but it was not accepted due to having too many conflicting changes.

I was wondering since if you might take a look, since most of them are your changes.

I think the solution would be something like:
Create a new branch from the origin/master ( https://github.com/slic3r/Slic3r.git ) and then cherry pick your commits which only contains the actual planer slicing feature (also perhaps revert the space changes, to keep the diff readable).
Then squash it into a single commit and push it upstream to the new branch.
Finally create a new pull request from that branch.

@Zip-o-mat
Copy link
Owner

Thanks for the info!
The code is not ready to be merged upstream at its current state

@2403772980ygy
Copy link

2403772980ygy commented Apr 7, 2020

I'm trying to force merge these branches to see if the conflicts do not matter when it comes to compiling. I'll report on this issue as soon as I got an advancement.

Edit: As excepted this won't work, but I think someone can figure this out soon.

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

No branches or pull requests

3 participants