The 'official' respositories can be compared to the role that PKP's old CVS repositories used to fill. Adding the official branch allows you to synchronize your code with the rest of the team, and should be pulled from before creating a patch or making a commit.

+

+

Execute:

+

<pre>

+

cd lib/pkp/

+

git remote add official git://github.com/pkp/pkp-lib.git

+

git checkout master

+

git pull official master

+

cd ../..

+

git remote add official git://github.com/pkp/omp.git

+

git checkout master

+

git pull official master

</pre>

</pre>

Line 104:

Line 120:

git checkout modal

git checkout modal

git stash pop

git stash pop

−

</pre>

−

−

= Add the official repository =

−

−

The 'official' respositories can be compared to the role that PKP's old CVS repositories used to fill. Adding the official branch allows you to synchronize your code with the rest of the team, and should be pulled from before creating a patch or making a commit.

Intro

This is the official process to check out OMP with the PKP library as a sub-module.

Create github.com user

Go to github.com and create a user account. Log in to your user account.

Delete existing personal forks

First you have to delete existing personal forks of omp/pkp-lib if you have cloned these repositories before. You obviously shouldn't do this when there are still changes in there you don't have in other locations!

Add the official repository

The 'official' respositories can be compared to the role that PKP's old CVS repositories used to fill. Adding the official branch allows you to synchronize your code with the rest of the team, and should be pulled from before creating a patch or making a commit.

Create development branches

Create development branches in the main project and the sub-module. I'll use the branch "modal" here but this is arbitrary. The branch name should represent the development topic you intend to work on.

You may get merge conflicts, if the repository you pull from did not merge in all changes from CVS already. See man git-merge for more info on how to solve merge conflicts. If you want to see another developer's code without merging it into your branch, you'll want to pull their branch onto a clean branch--Switch to the master the branch (use 'git stash' if you have uncommitted changes you want to save) and create a fresh branch, e.g. execute: