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

Merged, abandoned or rejected pull requests are moved here to clear the main Pull Requests forum.
User avatar
Kunda1
Veteran
Posts: 13434
Joined: Thu Jan 05, 2017 9:03 pm

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

Post by Kunda1 »

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:
Alone you go faster. Together we go farther
Please mark thread [Solved]
Want to contribute back to FC? Checkout:
'good first issues' | Open TODOs and FIXMEs | How to Help FreeCAD | How to report Bugs
User avatar
PrzemoF
Veteran
Posts: 3520
Joined: Fri Jul 25, 2014 4:52 pm
Contact:

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

Post by PrzemoF »

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
Veteran
Posts: 13434
Joined: Thu Jan 05, 2017 9:03 pm

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

Post by Kunda1 »

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.
Alone you go faster. Together we go farther
Please mark thread [Solved]
Want to contribute back to FC? Checkout:
'good first issues' | Open TODOs and FIXMEs | How to Help FreeCAD | How to report Bugs
paullee
Veteran
Posts: 5097
Joined: Wed May 04, 2016 3:58 pm

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

Post by paullee »

felixlee868 wrote: Wed Jul 03, 2019 12:57 pm Hi

I have merge branch felixlee to master on https://github.com/felixlee868/freecad

Hi Felix, there is a Chinese forum in FreeCAD, see if you would like to do an announcement what you are doing here. Maybe contribute some discussion there also. :)

https://forum.freecadweb.org/viewforum.php?f=40
vocx
Veteran
Posts: 5197
Joined: Thu Oct 18, 2018 9:18 pm

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

Post by vocx »

paullee wrote: Sun Aug 18, 2019 1:02 pm Hi Felix, there is a Chinese forum in FreeCAD,
Maybe you can help Felix with a pull request.

See the following thread, TechDraw templates update pull request.
Always add the important information to your posts if you need help. Also see Tutorials and Video tutorials.
To support the documentation effort, and code development, your donation is appreciated: liberapay.com/FreeCAD.
paullee
Veteran
Posts: 5097
Joined: Wed May 04, 2016 3:58 pm

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

Post by paullee »

I'll see what can i do :)
Post Reply