Git repositories created and how to work with them
Niko Sams
niko.sams at gmail.com
Tue May 4 18:40:20 UTC 2010
> I suggest that everybody tries to read a bit about how git and its branches
> can be used, for example here:
After some reading I propose now this:
- commit small/simple bugfixes in stable branch
- stable branch gets merged every saturday into master
- anyone can merge earlier (to get fixes into master sooner)
- larger bugfixes are done in a topic branch (forking off stable)
- topic branch gets merged into stable and master by the one who does the fix
- (rebase if forked off wrong branch)
- cherry-picking commits from master still can be done but should be avoided
(if you commited accidentally to master)
Niko
More information about the KDevelop-devel
mailing list