News for hackers. Stuff that matters.
Re:How We Make Trello by brown9-2 on Thursday March 13, 2014 @01:40PM (#7393346)
Is merging painful enough for you team that it's worth avoiding?
Re:How We Make Trello by sidcool on Thursday March 13, 2014 @01:44PM (#7393372)
It can't be avoided, but we do tend to try and minimize it.
Re:How We Make Trello by fishtoaster on Thursday March 13, 2014 @01:58PM (#7393467)
My experience has been that maximizing merges works best. If you're constantly merging, hardly any of your merges have any friction. The longer you're separate from the master branch, the more likely you are to get painful merges with conflicts and subtle bugs.
Re:How We Make Trello by erichurkman on Thursday March 13, 2014 @05:05PM (#7395036)
Elsewhere in the thread, you'll see that 'sidcool is on SVN, where merging is not a fun experience — which explains his team's aversion to merges.