[Merged] PR #2389 - Thickness tools is missing intersection-toggle option

About the development of the Part Design module/workbench. PLEASE DO NOT POST HELP REQUESTS HERE!
Forum rules
Be nice to others! Respect the FreeCAD code of conduct!
openBrain
Veteran
Posts: 9034
Joined: Fri Nov 09, 2018 5:38 pm
Contact:

Re: Thickness tools is missing intersection-toogle

Post by openBrain »

rynn wrote: Fri Aug 23, 2019 6:34 am Is there some additional procedure one has to do, to get a pull-request pulled?
No. Just wait a developer can review the code and merge it if OK. If not you'll get done remarks. ;)
User avatar
Kunda1
Veteran
Posts: 13434
Joined: Thu Jan 05, 2017 9:03 pm

Re: Thickness tools is missing intersection-toogle

Post by Kunda1 »

rynn wrote: Fri Aug 23, 2019 6:34 am
rynn wrote: Wed Jul 31, 2019 11:19 am Added a PR: https://github.com/FreeCAD/FreeCAD/pull/2389
Is there some additional procedure one has to do, to get a pull-request pulled?
Thanks for the PR. Core devs are pretty backed up with bug fixes for the previous Link branch merge + Packaging / Dependencies and CI fixes. They'll get around to this.
JFYI, please familiarize yourself with the difference between git merge and git rebase (rebase is more appropriate because it doesn't pollute the commit history). Also it helps when you label your commits in a sequential way so that the devs can follow the logic of how you coded things. Just some things to keep in mind for the future. Cheers!
Alone you go faster. Together we go farther
Please mark thread [Solved]
Want to contribute back to FC? Checkout:
'good first issues' | Open TODOs and FIXMEs | How to Help FreeCAD | How to report Bugs
rynn
Posts: 454
Joined: Tue Jul 31, 2018 7:00 am

Re: Thickness tools is missing intersection-toogle

Post by rynn »

Kunda1 wrote: Tue Aug 27, 2019 11:03 pm JFYI, please familiarize yourself with the difference between git merge and git rebase (rebase is more appropriate because it doesn't pollute the commit history). Also it helps when you label your commits in a sequential way so that the devs can follow the logic of how you coded things. Just some things to keep in mind for the future. Cheers!
If you refere to the list of“Merge branch 'master' into feature/thickness-intersect”-merges
These are the result of the [update branch]-button in github. So do not use this?
openBrain
Veteran
Posts: 9034
Joined: Fri Nov 09, 2018 5:38 pm
Contact:

Re: PR #2389 - Thickness tools is missing intersection-toggle option

Post by openBrain »

Not an expert but AFAIK, the way to go is to rebase locally then pushing :

Code: Select all

git pull --rebase upstream/master
git push [origin/my_branch]
wmayer
Founder
Posts: 20241
Joined: Thu Feb 19, 2009 10:32 am
Contact:

Re: PR #2389 - Thickness tools is missing intersection-toggle option

Post by wmayer »

Merged.
Post Reply