KDE git workflow

Torgny Nyblom nyblom at kde.org
Thu Jun 9 17:13:37 BST 2011

On Wednesday 08 June 2011 19.03.01 Cornelius Schumacher wrote:
> As you already know, we have discussed the git workflow for KDE at the
> Platform 11 sprint, and have come up with a recommendation. Please find the
> full text here: http://community.kde.org/KDE_Core/Platform_11/Git_Workflow

Local branches are always rebased, remote branches never 

When developing in a local branch, changes should always be rebased before 
pushing them to the remote origin. This keeps a simple linear history. 
Rebasing can be thought of as applying changes as patches to the latest 
version of the code. In case of conflicts they need to be adapted. So 
developers always patch against the latest version of the code. 

Remote branches are shared by multiple people. Rebasing them causes different 
people to have different versions of history, which causes conflicts, 
inconsistent and hard to understand states. So remote branches should never be 
rebased. Merging them properly also reflects that development actually 
happened in a side line. 

This part I fully agree with, however later in the example section it seems 
like rebasing should be done prior to review. Is the examples correct?


More information about the kde-core-devel mailing list