| |||||||||||||
Merge CommitsMerge CommitsPosted Oct 12, 2010 23:06 UTC (Tue) by smurf (subscriber, #17840)In reply to: Merge Commits by SEJeff Parent article: Lessons from PostgreSQL's Git transition
Wrong. That filter just blocks commits with auto-generated merge comments at their tip.
It does nothing to prevent one from "properly" merging a feature branch into mainline. That's a LOT less restrictive than PostgreSQL.
(Log in to post comments)
Merge Commits Posted Oct 13, 2010 12:12 UTC (Wed) by SEJeff (subscriber, #51588) [Link]
Ah I was incorrect. Thats a very good point you make there. Using git without the amazing merge capabilities just seems wrong.
It seems like if they want to force git to behave like cvs, they should just use svn.
|
|||||||||||||