Screwed up my FreeCAD repo? How to start over?

Here's the place for discussion related to coding in FreeCAD, C++ or Python. Design, interfaces and structures.
Forum rules
Be nice to others! Respect the FreeCAD code of conduct!
Post Reply
paullee
Veteran
Posts: 5097
Joined: Wed May 04, 2016 3:58 pm

Screwed up my FreeCAD repo? How to start over?

Post by paullee »

Hi all, seems had done something very wrong in June https://github.com/FreeCAD/FreeCAD/pull/4858.

Thought I can 'start over' and did below and another PR, but still something not correct. https://github.com/FreeCAD/FreeCAD/pull/5222. Any idea maybe to start over again ? :(


Overview of what had been done for PR 5222

Basically, every time I make reference to this post to do git, and know almost nothing more :-
https://forum.freecadweb.org/viewtopic. ... 10#p197095

I should have screwed up the local copy few weeks before during last PR. Then, I remove the whole FC folders and start over :-
- git clone https://github.com/myGitHubId/FreeCAD.git .
- git remote add upstream https://github.com/FreeCAD/FreeCAD.git

Catch up my newBranch with upstream/master (the "real" master):
- git checkout master
- git fetch upstream
- git merge upstream/master

Develop:
- git branch newBranchName
- git checkout newBranchName
- code, commit
- (forget if did a - git rebase master or not)
- git push --set-upstream origin ArchWall_realthunder_fix
( i.e. [ArchWall] Do not copy shape )


Thanks for any idea!
Post Reply