[Fixed]Build fails with todays source

Having trouble installing or compiling FreeCAD? Get help here.
Posts: 17920
Joined: Thu Feb 19, 2009 10:32 am

Re: Build fails with todays source

Post by wmayer »

I was working on the integration of this PR: https://github.com/FreeCAD/FreeCAD/pull/5355

Since there was still some issues I have checked out it locally and made some changes on it. In order to avoid an extra commit or a separate branch that will be squashed it's possible to make the changes directly with:

Code: Select all

git cherry-pick --ff <HASH>
git reset --soft HEAD~1
# make the changes
git add <modified files>
git commit -C HEAD@{1}
git push
Since I was not patient enough to wait for the build to be finished I already called git add <modified files> before fixing the "==" issue.
User avatar
Posts: 1960
Joined: Tue Dec 31, 2013 4:10 pm
Location: France

Re: [Fixed]Build fails with todays source

Post by Chris_G »

Werner, ... you're fired :lol:
Posts: 150
Joined: Wed Nov 06, 2013 3:58 am

Re: [Fixed]Build fails with todays source

Post by clytle374 »

Thank you!
Post Reply