Am Dienstag, 7. Mai 2013, 00:30:25 schrieb Albert Astals Cid: > 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? > > Asking for people not to merge is hard, people won't read this, so either > you enforce it somehow or merge it first like i said and make sure you > "kill" the duplicate commits.
You probably meant git checkout master git merge -s ours KDE/4.10 Eike
signature.asc
Description: This is a digitally signed message part.
