Changes between Version 24 and Version 25 of Developer/Git/Users

Timestamp:

12/02/20 11:30:02 (4 years ago)

Author:

rmueller

Comment:

github more information on forking

Developer/Git/Users

@@ -44 +44 @@
 = Making Changes =
 
-Git allows you to make changes in the RTEMS source tree and track those changes locally. We recommend you make all your changes in local branches. If you are working on a few different changes or a progression of changes it is best to use a local branch for each change. 
+Git allows you to make changes in the RTEMS source tree and track those changes locally. We recommend you make all your changes in local branches. If you are working on a few different changes or a progression of changes it is best to use a local branch for each change. When working with the RTEMS sources more regularly, it might also be a good idea to fork the repository. This can be done on github as well and is specified in the ''Using a github fork'' section below.
 
 A branch for each change lets your repo's master branch track the upstream RTEMS's master branch without interacting with any of the changes you are working on. A completed change is emailed to the developer's list for review and this can take time. While this is happening the upstream's master branch may be updated and you may need to rebase your work and test again if you are required to change or update your patch. A local branch isolates a specific change from others and helps you manage the process.
@@ -363 +363 @@
 
 You may prefer to keep your application and development work in a git repository for all the good reasons that come with version control. For public repositories, you may like to try [https://github.com GitHub] or [https://bitbucket.org/ BitBucket]. RTEMS maintains mirrors on GitHub, which can make synchronizing with upstream changes relatively simple. If you need to keep your work private, you can use one of those services with private repositories or manage your own server. The details of setting up a server are outside the scope of this document, but if you have a server with ssh access you should be able to [http://git-scm.com/book/en/Git-on-the-Server-Setting-Up-the-Server find instructions] on how to set up git access. Once you have git configured on the server, adding repositories is a snap.
+
+= Using a github fork =
+
+A github fork can be created by going to the RTEMS repository you want to work and click the ''Fork'' button at the top right.
+After that, the fork can be cloned with
+
+{{{
+git clone https://github.com/{github-user-name}/{rtems-repository-name}.git
+}}}
+
+It is recommended to add the main repositories as upstream remotes so changes can be integrated easily
+
+{{{
+git remote add upstream https://github.com/RTEMS/{rtems-repository-name}.git
+git fetch upstream
+}}}
+
+After that, changes in the upstream master (or any other branch) can be merged like this
+
+{{{
+git merge upstream master
+}}}
+
 =  Private Servers  =