User: Password:
|
|
Subscribe / Log in / New account

why skip the merge commits?

why skip the merge commits?

Posted Feb 21, 2007 20:17 UTC (Wed) by dlang (subscriber, #313)
In reply to: why skip the merge commits? by iabervon
Parent article: Who wrote 2.6.20?

the question is, should merge events be ignored, or can code changes take place as part of the merge event.

if so then we'll need to update the scripts to account for this when corbet releases them in a week or so.


(Log in to post comments)

why skip the merge commits?

Posted Feb 21, 2007 21:20 UTC (Wed) by iabervon (subscriber, #722) [Link]

Code changes really shouldn't be part of a merge event. Even resolving conflicts is really a matter of "not changing" stuff in some sense.


Copyright © 2017, Eklektix, Inc.
Comments and public postings are copyrighted by their creators.
Linux is a registered trademark of Linus Torvalds