I was overthinking this. Thanks for bringing me back to earth.
[Tracking] Backport commits to 0.20 branch
Forum rules
Be nice to others! Respect the FreeCAD code of conduct!
Be nice to others! Respect the FreeCAD code of conduct!
- wandererfan
- Veteran
- Posts: 6321
- Joined: Tue Nov 06, 2012 5:42 pm
- Contact:
Re: [Tracking] Backport commits to 0.20 branch
No problem. As said @adrianinaval, just be aware this is kind of things were merge conflicts can come pretty easily.wandererfan wrote: ↑Fri Oct 07, 2022 2:53 pm I was overthinking this. Thanks for bringing me back to earth.
Re: [Tracking] Backport commits to 0.20 branch
What is the correct procedure if you do not have sufficient permissions to push:
Fork 0.20 and do a PR?
Fork 0.20 and do a PR?
Re: [Tracking] Backport commits to 0.20 branch
Yes - you ca submit a PR against any branch, it's in a dropdown menu on GitHub. I'd make sure to also state that you are doing so very clearly in the PR so there is no question of whether it was an accident, etc.
Re: [Tracking] Backport commits to 0.20 branch
@openBrain's Spreadsheet: fix multi-screen management of QtColorPicker bugfix has been backported:
git commit cf6e561e5a9b7ddebdc465aa13eb247cf30ff46c
git commit cf6e561e5a9b7ddebdc465aa13eb247cf30ff46c
Re: [Tracking] Backport commits to 0.20 branch
Thanks!chennes wrote: ↑Fri Oct 21, 2022 2:33 pm @openBrain's Spreadsheet: fix multi-screen management of QtColorPicker bugfix has been backported:
git commit cf6e561e5a9b7ddebdc465aa13eb247cf30ff46c
When backporting please don't forget to add this to the list of the initial post since we use the list for the release notes.
- adrianinsaval
- Veteran
- Posts: 5551
- Joined: Thu Apr 05, 2018 5:15 pm
Re: [Tracking] Backport commits to 0.20 branch
The FreeCAD-0.20.2-WIN-x64-portable-2.zip file:
https://github.com/FreeCAD/FreeCAD/rele ... able-2.zip
Is not a ZIP but a copy of the EXE.
@uwestoehr Can you fix this please? Thanks.
https://github.com/FreeCAD/FreeCAD/rele ... able-2.zip
Is not a ZIP but a copy of the EXE.
@uwestoehr Can you fix this please? Thanks.
Re: [Tracking] Backport commits to 0.20 branch
In what way should I fix this? You can just unpack the ZIP and get FreeCAD. I can try to make a special ZIP file but it will be larger in size. Therefore I saw no benefit.Roy_043 wrote: ↑Sun Jan 15, 2023 6:55 pm The FreeCAD-0.20.2-WIN-x64-portable-2.zip file:
https://github.com/FreeCAD/FreeCAD/rele ... able-2.zip
Is not a ZIP but a copy of the EXE.
@uwestoehr Can you fix this please? Thanks.
Re: [Tracking] Backport commits to 0.20 branch
Misnaming an exe file is very, very bad practice.
A common method for distribution of malware.
I have no interest whether it is a zip or an exe, but it must be named correctly.
Gene
A common method for distribution of malware.
I have no interest whether it is a zip or an exe, but it must be named correctly.
Gene