On Mon, Feb 17, 2014 at 3:07 PM, Michael Biebl <[email protected]> wrote:
> 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? > > Ahh... I don't like that part of the github interface. It looks like they always do the PR against master branch if you don't insist otherwise. When you create a pull request, there is an "edit" button on the right side of that PR. If you hit it, you can select the branch where you really want to do the PR against. Unfortunately, these branches are in light grey on the screen and also abbreviated. Should a merge request be done against the "oldest" branch it applies too? > IMHO that's best. > Should the merge request say which branches this fix should be merged > in or will you do that yourself? > Just speaking for me. It's definitely appreciated if it's mentioned, and if you setup the PR like I mentioned above, you'll also get that info with the request. In any case, I always check if there is an older version where it makes sense to merge in (except if I have a real bad day ;)). Rainer > -- > 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.
