TechDraw: The People's Republic of China Templates A serial

Post here if you have re-based and finalised code to integrate into master, which was discussed, agreed to and tested in other forums. You can also submit your PR directly on github.
User avatar
Kunda1
Posts: 4755
Joined: Thu Jan 05, 2017 9:03 pm

Re: TechDraw: The People's Republic of China Templates A serial

Post by Kunda1 » Thu Jul 04, 2019 12:46 pm

Hey 'old man', you are fantastic! Thanks for the contribution.
git still confuses me so no worries. I had the PR ready to trigger but @PrzemoF beat me to it :evil: :lol:

@felixlee868 in regards to github...
the way I do it:
By the way, I cheat and use gitkraken which is a git Graphical Users Interface but nevertheless, i've documented it on the github wiki page how to submit a PR. I also use a browser extension called Refined Github (link) that makes using github even better
  • I fork a project through github (i click the fork button)
  • I copy the cloned URL
  • Then in my local machine I open a terminal and type:
    git clone <pasted-cloned-url>
  • Then I add the FreeCAD/FreeCAD repo as an upstream 'remote':
    git remote add upstream https://github.com/FreeCAD/FreeCAD.git
  • I double check that the configurations are correct with: git remote -v
    Result should look like:

    Code: Select all

        origin	https://github.com/GITHUB_USERNAME/FreeCAD.git (fetch)
        origin	https://github.com/GITHUB_USERNAME/FreeCAD.git (push)
        upstream	https://github.com/FreeCAD/FreeCAD.git (fetch)
        upstream	https://github.com/FreeCAD/FreeCAD.git (push)
  • Then create and checkout a new branch:
    git checkout -b myNewBranch
  • Make your modifications to the source code
  • git add .
  • git commit -m"Short and sweet git commit message"
  • Just in case the FreeCAD master has been updated run git fetch && git rebase master
  • Push your branch to Github: git push origin
  • Go to your browser and refresh your github repository. There should be an green curved arrow icon in the top right of the page notifying you that there is a branch and it can be made in to PR. Click this button and make sure that you are submitting the PR to FreeCAD/FreeCAD (not to your own repository!).
Hopefully that doesn't confuse you further. :oops: :lol:
Want to contribute back to FC? Checkout:
#lowhangingfruit | Use the Source, Luke. | How to Help FreeCAD | How to report FC bugs and features

User avatar
PrzemoF
Posts: 2598
Joined: Fri Jul 25, 2014 4:52 pm
Contact:

Re: TechDraw: The People's Republic of China Templates A serial

Post by PrzemoF » Thu Jul 04, 2019 12:54 pm

Kunda1 wrote:
Thu Jul 04, 2019 12:46 pm
[..]git still confuses me so no worries. I had the PR ready to trigger but @PrzemoF beat me to it :evil: :lol: [..]
I wasn't me..

User avatar
Kunda1
Posts: 4755
Joined: Thu Jan 05, 2017 9:03 pm

Re: TechDraw: The People's Republic of China Templates A serial

Post by Kunda1 » Thu Jul 04, 2019 1:06 pm

PrzemoF wrote:
Thu Jul 04, 2019 12:54 pm
Kunda1 wrote:
Thu Jul 04, 2019 12:46 pm
[..]git still confuses me so no worries. I had the PR ready to trigger but @PrzemoF beat me to it :evil: :lol: [..]
I wasn't me..
:facepalm: my bad.
Want to contribute back to FC? Checkout:
#lowhangingfruit | Use the Source, Luke. | How to Help FreeCAD | How to report FC bugs and features

Post Reply