> > > > Firstly - if you need Matt's stuff (requiring a merge) - that implies > the feature is not yet complete. So it should not be merged to next > [until the feature is complete] >
It was in next, but not in master. It is all in master now. > > But if 'Matt does and it is not in master' - then surly merging > 'master' would not help? > > Just wanted to make sure that you are not merging 'master' when you > don't need it. > I am merging master more than I need to, just to be up to date. I guess it pollutes the history with all these merges. And I should squash them... > > Satish >
