On Mon, Jan 25, 2016 at 10:15 AM Dawid Weiss <[email protected]> wrote:
> For example I > disagree with Mark that multiple merges and then final merge are a bad > thing in general. They are fairly straightforward in the commit graph > and they very clearly signify that somebody was working on their own > stuff and periodically synced up with changes on the master (or any > other branch). > It sounds like you are talking about something else. If you are legitimately working on a large feature, what you would an svn branch for, merge commits can make sense. That's not the general case at all. Like I said, it's about determining when the merge commit adds value and when it just creates complexity with no extra value. Other than that, you guys are just too obsessed with 'forbidden'. We talk about getting on the same page and guidelines, and you guys talk about 'forbidden' and 'bans'. You are just talking past us. Do some googling. Pretty much every project faces this and either decides to create an insane amount of merge commits or not. Both choices are taken, but the path that is almost never taken is, everyone just does whatever the hell they want without discussing first. - Mark -- - Mark about.me/markrmiller
