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

[Path] Added new feed rate (Ramp Feed Rate) option in PathDressupRampEntry.py #2901

Merged
merged 1 commit into from Jan 18, 2020

Conversation

Schildkroet
Copy link
Contributor

Added new option for ramp feedrate.
Line: 59 and 590f

@vocx-fc
Copy link
Contributor

vocx-fc commented Jan 14, 2020

The entire file looks like it is modified. This could mean that your text editor is changing the line endings of every line. The line endings should stay LF (Unix). Please check that they aren't changed to CR LF (Windows).

@vocx-fc
Copy link
Contributor

vocx-fc commented Jan 14, 2020

You should squash your two commits so that there is only one, because the change of line endings shouldn't be its own commit.

@Schildkroet
Copy link
Contributor Author

This will get only worse.... I'm not an expert with git

@vocx-fc
Copy link
Contributor

vocx-fc commented Jan 14, 2020

It's not too hard. Have no fear.

git rebase -i HEAD~2

There is a squash section in Source code management.

@yorikvanhavre yorikvanhavre changed the title Added new feed rate (Ramp Feed Rate) option in PathDressupRampEntry.py [Path] Added new feed rate (Ramp Feed Rate) option in PathDressupRampEntry.py Jan 15, 2020
Changed line endings to unix in PathDressupRampEntry.py

Changed line endings to unix in PathDressupRampEntry.py
@vocx-fc
Copy link
Contributor

vocx-fc commented Jan 16, 2020

Good job Schildkroet.

@sliptonic sliptonic merged commit 2064410 into FreeCAD:master Jan 18, 2020
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.

None yet

3 participants