Git (and Python) workflow when contributing to the official KiCad libraries: Difference between revisions
Git (and Python) workflow when contributing to the official KiCad libraries (view source)
Revision as of 20:15, 5 August 2019
, 4 years agono edit summary
No edit summary |
|||
Line 99:
</syntaxhighlight>
Add the official KiCad repo as another remote. This takes care of keeping all branches up-to-date between your downstream repository or fork ("origin") and the KiCad repo ("upstream"). This only needs to be done once:<ref name="atl"/><ref name="howto">[https://medium.com/sweetmeat/how-to-keep-a-downstream-git-repository-current-with-upstream-repository-changes-10b76fad6d97 How to keep a downstream git repository current with upstream repository changes]</ref>
<syntaxhighlight lang="linux-config">
git remote add upstream https://github.com/KiCad/kicad-footprints.git
Line 144:
git push # push your fixes to GitHub (will automatically appear in the pull request)
</syntaxhighlight><ref name="git4newbs"/><ref name="">[https://forum.kicad.info/t/workflow-for-better-kicad-library-contribution-git-kicad/10593/3 Workflow for better KiCad library contribution (Git + KiCad)], KiCad.info Forums, May 2018</ref>
To keep your fork current with the upstream repository:<ref name="howto"/>
<syntaxhighlight lang="linux-config">
$ git merge upstream/master
</syntaxhighlight>
<!-- == See also == -->
| |||