GIT repo with trunk code

This page provides documentation for the successful usage of Scribus Git repositories for Scribus development. After this set of commands you will have your own branch in local folder and in scribus.git repository but based on current trunk.git repository image.

Initialisation of local GIT repo: Add scribus.git as remote repo: Creating local branch: Add trunk.git as second remote repo: Pull from trunk: After any local changes and committing push them to remote branch: You should pull changes from trunk often to keep your repo in sync. Be careful to not push your changes to repos which are not in sync with trunk and available for others for push (eg. origin/master).

Creating new remote branch
First you should create new local branch. You must be in your local repo directory. Next you must push new branch into remote repo:

After pull/fetch from trunk
Sometimes after merging current state of trunk into my local repo diff starts to show some files which I not touch. In that case helps this command applied for problematic files (or with * in problematic directory - be careful with your changes as you can lost them!):