In the first go I checked out to my existing local repository, made my changes, added them and succeeded finally to make a commit. When I tried to create a pull request the changed stuff had gone.
So I went the triplus way:
I moved my local repository because it was called "FreeCAD" as well.
Then I continued with the git commands:
When I came totriplus wrote: ↑Sat Oct 14, 2017 10:33 pmCode: Select all
git clone https://github.com/YOUR-USERNAME/FreeCAD cd FreeCAD git remote add upstream https://github.com/FreeCAD/FreeCAD.git git fetch upstream git checkout master git merge upstream/master git push
Code: Select all
git checkout master
Code: Select all
FreeCAD$ git checkout master
error: The following untracked working tree files would be overwritten by checkout:
.arcconfig
.gitattributes
.github/PULL_REQUEST_TEMPLATE.md
.gitignore
.log_errors
.subuser.json
.travis.yml
BuildAll.bat
BuildRelease.ini
BuildRelease.py
CMakeLists.txt
COPYING
ChangeLog.txt
LibraryVersions.h.cmake
README.md
appveyor.yml
cMake/ConfigureChecks.cmake
cMake/FindCoin3D.cmake
cMake/FindCoin3DDoc.cmake
cMake/FindEigen2.cmake
cMake/FindEigen3.cmake
cMake/FindKDL.cmake
cMake/FindMEDFile.cmake
cMake/FindMatplotlib.cmake
cMake/FindNETGEN.cmake
cMake/FindOpenCV.cmake
cMake/FindOpenCasCade.cmake
cMake/FindPyCXX.cmake
cMake/FindPySide2Tools.cmake
cMake/FindPySideTools.cmake
cMake/FindRift.cmake
cMake/FindSMESH.cmake
cMake/FindSpnav.cmake
cMake/FindWix.cmake
cMake/FindXercesC.cmake
cMake/FreeCadMacros.cmake
cMake/UseLibPack10x.cmake
cMake/UseLibPack6x.cmake
cMake/UseLibPack7x.cmake
cMake/UseLibPack8x.cmake
cMake/UseLibPack9x.cmake
cMake/UseLibPackCLbundler.cmake
cMake/UseLibPackCustom.cmake
config.h.cmake
data/CMakeLists.txt
data/License.txt
data/examples/ArchDetail.FCStd
data/examples/CMakeLists.txt
data/examples/DrawingExample.FCStd
data/examples/EngineBlock.FCStd
data/examples/Fem.FCStd
data/examples/Fem2.FCStd
data/examples/FemCalculixCantilever2D.FCStd
data/examples/FemCalculixCantilever3D.FCStd
data/examples/PartDesignExample.FCStd
data/examples/RobotExample.FCStd
data/examples/Schenkel.stp
data/tests/Crank.fcstd
data/tests/Crank.py
data/tests/Jt/Engine/2_Cylinder_Engine.jt
data/tests/Jt/Engine/2_Cylinder_Engine/Cam_shaft_123_457_0_Parts.jt
data/tests/Jt/Engine/2_Cylinder_Engine/Case_r_123_200_0_Parts.jt
data/tests/Jt/Engine/2_Cylinder_Engine/Cylinder_1_123_100_0_Parts.jt
data/tests/Jt/Engine/2_Cylinder_Engine/Cylinder_2_123_101_0_Parts.jt
data/tests/Jt/Engine/2_Cylinder_Engine/Head_1_123_150_0_Parts.jt
data/tests/Jt/Engine/2_Cylinder_Engine/Head_2_123_151_0_Parts.jt
data/tests/Jt/Engine/2_Cylinder_Engine/Head_Nut_123_005_0_Parts.jt
data/tests/Jt/Engine/2_Cylinder_Engine/Head_Stud_123_006_0_Parts.jt
data/tests/Jt/Engine/2_Cylinder_Engine/Lifter_123_923_0_Parts.jt
data/tests/Jt/Engine/2_Cylinder_Engine/Piston_123_844_0_Parts.jt
data/tests/Jt/Engine/2_Cylinder_Engine/Piston_pin_123_845_0_Parts.jt
data/tests/Jt/Engine/2_Cylinder_Engine/Rocker_Arm_123_600_0_Parts.jt
data/tests/Jt/Engine/2_Cylinder_Engine/Rocker_Arm_Shaft_123_601_0_Parts.jt
data/tests/Jt/Engine/2_Cylinder_Engine/Rocker_Arm_copy_123_602_0_Parts.jt
data/tests/Jt/Engine/2_Cylinder_Engine/Rocker_Bolt_123_603_0_Parts.jt
data/tests/Jt/Engine/2_Cylinder_Engine/Rocker_Mount_123_604_0_Parts.jt
data/tests/Jt/Engine/2_Cylinder_Engine/Rocker_Mount_Cap_123_608_0_Parts.jt
data/tests/Jt/Engine/2_Cylinder_Engine/Spark_Plug__0_Parts.jt
data/tests/Jt/Engine/2_Cylinder_Engine/Spring_Link__0_Parts.jt
data/tests/Jt/Engine/2_Cylinder_Engine/Valve_123_700_0_Parts.jt
data/tests/Jt/Engine/2_Cylinder_Engine/Valve_Cover_123_701_0_Parts.jt
data/tests/Jt/Engine/2_Cylinder_Engine/Valve_Cover_copy__0_Main.jt
data/tests/Jt/Engine/2_Cylinder_Engine/Valve_Spring_123_702_0_Parts.jt
data/tests/Jt/Engine/2_Cylinder_Engine/Valve_Spring_Cap_123_704_0_Parts.jt
data/tests/Jt/Engine/2_Cylinder_Engine/cam_gear_123_456_0_Parts.jt
data/tests/Jt/Engine/2_Cylinder_Engine/crank_123_782_0_Parts.jt
data/tests/Jt/Engine/2_Cylinder_Engine/crank_gear_123_783_0_Parts.jt
data/tests/Jt/Engine/2_Cylinder_Engine/cylinder_bolt_pattern__0_Parts.jt
data/tests/Jt/Engine/2_Cylinder_Engine/rod_123_699_0_Parts.jt
data/tests/Jt/Engine/2_Cylinder_Engine1_Internals.plmxml
data/tests/Jt/Engine/2_Cylinder_Engine2_Externals.plmxml
data/tests/Jt/Engine/2_Cylinder_Engine3.plmxml
data/tests/Jt/Engine/2_Cylinder_Engine3.xml
data/tests/Jt/Engine/2_Cylinder_Engine3_Exploded.plmxml
data/tests/ModelRefineTests/Y_Rod_Mount.brep
data/tests/ModelRefineTests/ZMotorMountscripted.brep
data/tests/ModelRefineTests/aox.brep
data/tests/ModelRefineTests/blocks144.brep
data/tests/ModelRefineTests/cylinder1.brep
data/tests/ModelRefineTests/cylinder3.brep
data/tests
Aborting
cb@ubuntu:/maccb/Users/cb/FreeCAD$ git checkout masterB
- I downloaded these files seconds before from the repository and now they seem to be unversioned.
- in the commands you gave: is "upstream" a git keyword or a self selected identifier (like YOUR-USERNAME)
I am willing to delete all my git repositories if there is a chance to do the following:
- Initialize
I need to check out a FreeCAD to my local computer. - Contribute
I want to make the following steps repeatedly:- Sync my local repository with the official FreeCAD repository
- Make my changes
- Create a pull request, so others can verify and commit them to the official repository
I really want to contribute to FreeCAD, albeit small things for now, and I have some minor things in the pipeline. But this git stuff is completely pushing me off. I don't want to invest hours and hours in a pull request, if the change has taken only two or three, bug tracking included. mlampert helped me the first time I tried - finally successful - but I didn't succeed with the set of commands I have recorded.
I tried the procedure from https://forum.freecadweb.org/viewtopic. ... 21#p180425 as well, but I get the same error as before.
So please can anyone give me a set of git commands for the tasks mentioned above.