On Fri, 1 Nov 2013, Jed Brown wrote: > Satish Balay <[email protected]> writes: > > > On Fri, 1 Nov 2013, Satish Balay wrote: > > > >> > The reason I had to merge all that stuff into saws was that saws > >> > could not merge into next because those branches so changed > >> > next. I had to merge them into saws before I could get saws into > >> > next. > > Peter forgot what had been released to 'next' and rebased after merging, > leading to two copies of the earlier commits. I think that is the > reason for much of this confusion.
Should 'prbrune/sf-sfbasicops' and 'prbrune/mat-matcolor' be cleaned up to remove the merge between the 'rebased' and 'non-rebased' variants of the branches - before the changes got into master? Satish
