> Any people with more git merging experience want to point to a guide > to dealing with that sort of thing? I've used git for years, but I'm > really having a hard time wrapping my head around the way we're using > it, even with the guides on the Wiki.
That's a good point, I think we need to add this to the new GIT-RULES file too, it says there about doing the merges but doesn't say how to handle empty merges, conflicts, etc. Maybe put it into GIT FAQ and put the link to the rules file. -- Stanislav Malyshev, Software Architect SugarCRM: http://www.sugarcrm.com/ (408)454-6900 ext. 227 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
