Rainer: Yep. I am completely sold on the merge from bottom to top idea you are using. :)
Michael: Usually it works best to find the oldest branch that the issue applies to. I merge changes from the oldest documentation up to master. This makes updates considerably faster since we only have to edit the files once. After that it's just a series of git pulls, git pushes and occasionally editing a file to clean up a merge. And having the branches it applies do doesn't hurt. It at least helps me keep my eyes open for things. And it looks like the PR was made against the master branch in Github. I suspect that was just because of a selection box here or there. I've done it once or twice myself. -- James -----Original Message----- From: [email protected] [mailto:[email protected]] On Behalf Of Michael Biebl Sent: Monday, February 17, 2014 8:08 AM To: rsyslog-users Subject: Re: [rsyslog] [doc] Please take a look at imfile in rsyslog-doc's v5-stable branch and give opinions 2014-02-17 14:52 GMT+01:00 Rainer Gerhards <[email protected]>: > On Mon, Feb 17, 2014 at 2:33 PM, Boylan, James <[email protected]>wrote: > >> Michael - >> >> You had made a merge against v8-devel (Master) branch. But when I >> looked at it I realized the typo was in all versions. I went ahead >> and corrected in v5-stable then merged to the rest of the branches. >> Its fixed now. Thanks for catching that. :) >> >> > James, > > side-note: this happens quit frequently on the code repo as well. I'll > routinely do what you did and check where it is best to be merged. > It's convenient for users and so helps get contributions. I expect > that this happens with the doc project as well. > > I just wanted to mention, even though I see you already had the same > thought ;) I made those merge requests on top of the v7-stable branch. But it seems that info got lost in the merge request? I don't know github well enough, is there a way to preserve that information when creating a merge request? Should a merge request be done against the "oldest" branch it applies too? Should the merge request say which branches this fix should be merged in or will you do that yourself? -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth? _______________________________________________ rsyslog mailing list http://lists.adiscon.net/mailman/listinfo/rsyslog http://www.rsyslog.com/professional-services/ What's up with rsyslog? Follow https://twitter.com/rgerhards NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a myriad of sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if you DON'T LIKE THAT. _______________________________________________ rsyslog mailing list http://lists.adiscon.net/mailman/listinfo/rsyslog http://www.rsyslog.com/professional-services/ What's up with rsyslog? Follow https://twitter.com/rgerhards NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a myriad of sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if you DON'T LIKE THAT.
