El Dimarts, 7 de maig de 2013, a les 00:54:20, Albert Astals Cid va escriure: > El Dilluns, 6 de maig de 2013, a les 19:49:13, Nicolás Alvarez va escriure: > > 2013/5/6 Albert Astals Cid <[email protected]> > > > > > El Dilluns, 6 de maig de 2013, a les 19:37:15, Nicolás Alvarez va > > escriure: > > > > 2013/5/6 Albert Astals Cid <[email protected]> > > > > > > > > > El Dissabte, 4 de maig de 2013, a les 14:01:45, Vishesh Handa va > > > > > > escriure: > > > > > > Hey everyone > > > > > > > > > > > > As you might have heard there was a fiasco in the nepomuk-core > > > > > > repository > > > > > > where the 'master' branch was accidentally merged into KDE/4.10. > > > > > > Since > > > > > > > > then > > > > > > > > > > > the system admins had to do a hard reset to v4.10.2 and I had to > > > > > > manually > > > > > > cherry-pick a lot of the commits. > > > > > > > > > > > > I do not want anyone to merge KDE/4.10 into master. It will lead > > > > > > will a > > > > > > > > > number of duplicate commits, and considering we already have a LOT > > > > > > of > > > > > > duplicates I do not want any more. > > > > > > > > > > Can't you just merge the branches, then rebase -i and in the rebase > > > > > actually > > > > > remove all the duplicated commits? > > > > > > > > What would that achieve? If you rebase, the history becomes linear and > > > > > > the > > > > > > > merge stops being a merge. > > > > > > This gives you a master branch where KDE/4.10 has already been merged > > > (so > > > next > > > merges don't bring in all the new duplicate commits) and has no > > > duplicate > > > commits (since you killed them in the rebase -i). > > > > rebase will linearize the history, removing the merge commit, which means > > 4.10 won't be recorded as "already been merged" anymore. > > I've done it in the poppler repo, and it has worked.
Or maybe it has not. Sorry for the noise. Cheers, Albert > > Cheers, > Albert
