add new function to fem module
Moderator: bernd
Forum rules
and Helpful information for the FEM forum
and Helpful information for the FEM forum
Re: add new function to fem module
till this point i understand it all ready...
what i mean
first fetch the data from the upstream
second rebase -something?
(against method for merge:
first fetch the data from the upstream
second merge
)
what i mean
first fetch the data from the upstream
second rebase -something?
(against method for merge:
first fetch the data from the upstream
second merge
)
Re: add new function to fem module
in my personal git repo the official FreeCAD github remote branch is called sfmaster. What I do is:
open a browse and check on github
go to FreeCAD forum and show my development to other people
Code: Select all
git checkout -b mynewfeaturebranch
# do some developing and commit them, by the time official master has lots of new commits
git checkout mynewfeaturebranch
git status # to check if the mynewfeaturebranch is the active one
# fetch official FreeCAD from github
git fetch sfmaster
# rebase the commits from mynewfeaturebranch on top of official FreeCAD
git rebase sfmaster/master
# push everythin to github
# git push addresstomygithub mynewfeaturebranch
go to FreeCAD forum and show my development to other people
Re: add new function to fem module
@Jee-Bee git is hard to learn until some showed me GitExtension
https://sourceforge.net/projects/gitextensions/
Just make sure you run the correct mono and things get easier
https://sourceforge.net/projects/gitextensions/
Just make sure you run the correct mono and things get easier
Re: add new function to fem module
I had used git before but just me... far more easy!!
i screwed up... don't know yet what, but i have to repear copie and redo in new branch...
i screwed up... don't know yet what, but i have to repear copie and redo in new branch...
This branch is 216 commits ahead, 243 commits behind FreeCAD:master.
Re: add new function to fem module
i don't get it build jet... a pity
Re: add new function to fem module
build for me on debian jessieJee-Bee wrote:Oke fixed it...
https://github.com/Jee-Bee/FreeCAD/tree/buckle
Re: add new function to fem module
I would call the property EigenmodeNumbers instead of NumberEigenmodes because in the property editor the properties are sorted by abc.
Re: add new function to fem module
not a clue what i do different...bernd wrote:in my personal git repo the official FreeCAD github remote branch is called sfmaster. What I do is:
Code: Select all
git checkout -b mynewfeaturebranch # do some developing and commit them, by the time official master has lots of new commits git checkout mynewfeaturebranch git status # to check if the mynewfeaturebranch is the active one # fetch official FreeCAD from github git fetch sfmaster # rebase the commits from mynewfeaturebranch on top of official FreeCAD git rebase sfmaster/master # push everythin to github # git push addresstomygithub mynewfeaturebranch
first i had to create an upstream otherwise i can't fetch from FreeCAD git
Code: Select all
jee-bee@Picasso:~/FCdev/FreeCAD$ git remote -v
origin https://github.com/Jee-Bee/FreeCAD (fetch)
origin https://github.com/Jee-Bee/FreeCAD (push)
upstream https://github.com/Freecad/FreeCAD.git (fetch)
upstream https://github.com/Freecad/FreeCAD.git (push)
Code: Select all
jee-bee@Picasso:~/FCdev/FreeCAD$ git fetch upstream
jee-bee@Picasso:~/FCdev/FreeCAD$ git rebase
First, rewinding head to replay your work on top of it...
Fast-forwarded buckle to refs/remotes/origin/buckle.
Re: add new function to fem module
since you have just a few commits, you can do it without rebase too ...
to update the bucklebranch, when upstream has new commits
hope that helps
Code: Select all
# fetch official FreeCAD from github
git fetch upstream
# checkout official FreeCAD
git checkout upstream/master
git status # to check on which branch you are, you are on no branch, you are in detached HEAD mode
git log -1 --oneline # last commit hash of FreeCAD upstream master
# checkout the new bucklebranch
git checkout -b bucklebranch
git status # to check on which branch you are
git log -1 --oneline # last commit hash should be the same as upstream master
# do some developing and commit them
# or cherry-pick the buckle commits
git cherry-pick 942384a # your buckle commit on github
# push everything to github
# git push https://github.com/Jee-Bee/FreeCAD bucklebranch
Code: Select all
# fetch official FreeCAD from github
git fetch upstream
# checkout the bucklebranch
git checkout bucklebranch
git status # to check on which branch you are
git log -1 --oneline # last commit off buckle branch
# rebasing, put all your buckle commits on HEAD of upstream/master
git rebase upstream/master