Hi, John Johansen: > So I am not a fan of the merge commit, it creates a messier history and > can break bisecting, especially where its an interaction between certain > patches you are looking for not just a single breaking commit.
> But I can live with it, with some provisos. > The person who does the merge commit, show up as the author of the > merge, I'm not thrilled with that. As he may just be the person doing > the signed-off-by: for the merge (and yes I know the individual > commits within retain the proper authorship). > So if we use the web merge, make sure to edit the commit message. > Add the necessary reviewer and acked-by lines. And I can live > with this. > Requiring people to do this locally via a rebase and editing each > commit feels like too much of a barrier. I agree with all this. Cheers, -- intrigeri -- AppArmor mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/apparmor
