I start basic programming for FEM workbench... see viewtopic.php?f=18&t=20217&p=162309#p162309
the problem i have is rebasing. Since i started some stuff changes so i get rebase errors.
Code: Select all
USER@Picasso:~/FCdev/FreeCAD$ git rebase upstream2/femdev
First, rewinding head to replay your work on top of it...
Applying: Add buckling functionality no gui for ccx solver
Using index info to reconstruct a base tree...
M src/Mod/Fem/FemInputWriterCcx.py
M src/Mod/Fem/FemToolsCcx.py
A src/Mod/Fem/_FemSolverCalculix.py
.git/rebase-apply/patch:63: trailing whitespace.
.git/rebase-apply/patch:115: trailing whitespace.
warning: 2 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging src/Mod/Fem/PyObjects/_FemSolverCalculix.py
Auto-merging src/Mod/Fem/FemToolsCcx.py
Auto-merging src/Mod/Fem/FemInputWriterCcx.py
CONFLICT (content): Merge conflict in src/Mod/Fem/FemInputWriterCcx.py
error: Failed to merge in the changes.
Patch failed at 0001 Add buckling functionality no gui for ccx solver
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".
What is a proper/ better working method to avoid this??