Vladimir Nadvornik <nadvor...@suse.cz> writes: > Hi, > > I think that one of the reasons of stalled development was creating the > personal branches in git, without setting processes for merging. I am still > not that familiar with various development models that git allows, so I'd > suggest to keep it simple, similar to subversion workflow: > > - master branch should always compile and basically work > - every developer with git access is responsible for pushing his > code to master as soon as it meets the above criteria > - no official code review, but everybody is encouraged to look at the changes > - problems are solved when they arise, reverting a commit is easy
Sounds exactly right to me (although I realize I've been more greybeard than useful). git allows all sorts of ways of doing things, but the notion of a specific branch in a specific repo being what counts I think is still a good thing. I would add, as suggestions: for complicated changes, people are encouraged to ask for review/test of a branch before it is merged to master. when merging branches to master, use --no-ff in the git merge command, so there will be an explicit merge commit. When one merges master to a branch, checks that it still works, and then merges back to master, often the merge back to master is a fast-forward merge and this is boggling when going through the history. (I am running a large private project where we use this rule, and it really helps; one can 'git log --first-parent' and see all the direct master commits and merge commits between releases, etc.)
pgpRdnu2Y1BP3.pgp
Description: PGP signature
------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________ Geeqie-devel mailing list Geeqie-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/geeqie-devel
