You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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.
The text was updated successfully, but these errors were encountered:
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.
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.
The text was updated successfully, but these errors were encountered: