git developer workflow

Developer Workflow

Setting up the repo

• Fork the project
• Clone the repository to your local computer.

$ git clone https://github.com/<username>/scribus

• Take a nap / Go for a walk / Read those awesome blogs you bookmarked under 'Read Later'
• Add an upstream remote to scribusproject/scribus

$ git remote add upstream https://github.com/scribusproject/scribus

• Checkout svn branch

$ git checkout svn

Synchronizing the updates from svn repository

• Pull the svn branch from upstream

$ git checkout svn
$ git pull upstream svn

• Pull the master branch from upstream

$ git checkout master
$ git pull upstream master

• Before merging the svn updates into master, create a new temporary branch based off master

$ git checkout master        # (optional) make sure you are in master
$ git branch mergeWithSVN

• Merge the svn branch into the newly created temporary branch. Uses the -X theirs strategy which picks the svn branch version in case of conflicts.

$ git merge svn -X theirs

• Push the mergeWithSVN branch to your github repository <username>/scribus

$ git push origin mergeWithSVN

• Open a pull request from <username>/scribus:mergeWithSVN to scribusproject/scribus:master