On Wed, Feb 20, 2013 at 03:55:59PM -0500, Chip Childers wrote: > On Fri, Feb 15, 2013 at 11:03:27AM -0800, Edison Su wrote: > > My branch is not a feature branch, while other features are depended on it. > > I didn't add any new feature on the branch, all the existing marvin > > automated tests should work. Instead of testing and fixing on my branch > > then merge, is it better to test and fix on master after the merge, using > > existing marvin test? > > IMO, it's not ever good to intentionally to break master. >
Edison - I see that you merged this into master today. Is master now in a state where it's broken? Did you run the marvin tests against your branch prior to the merge? -chip
