On Saturday 16 January 2010 20:36:12 Thomas McGuire wrote: > On Saturday 16 January 2010 19:32:47 Thiago Macieira wrote: > > Merges in Git always merge all commits, never any less. That's a > > definition of merge. [..] You design your branches so that all commits > > are mergeable. > > I hope I can still merge the commits one by one, instead of all in one go. > Because of the KDE3 to KDE4 port needed for our commits, those commits are > inherently unmergable without manually resolving conflicts.
Ignore that, Thomas Z. said this is easily possible. Regards, Thomas
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ Kde-scm-interest mailing list [email protected] https://mail.kde.org/mailman/listinfo/kde-scm-interest
