OK, folks, let me give an update on the whole topic. I've now tried for a couple of weeks to avoid merge entries in the git history. That approach works, but it creates a lot of overhead and quite some confusion for a lot of folks. Some users have voiced they don't really care if there is a merge entry. Viewer have voiced they don't like them. Michael Biebl has pointed out that it is easy to make them disappear from "git log".
After careful consideration and some frustration, I conclude that avoiding merge entries is unnecessary overhead for me. Being the 90%+ contributor for this project, I conclude that avoigin merge entries is unncessary overhead for the project. As such, I will no longer try to avoid them at all costs. I will, however, try to keep the git history as neast as *possible*, but not go any more length for that. As such, I'll reset the default branch on github to "master" and will accept pull requests to master. Internally, everything still needs to go through master-candidate, as this is how the new testbench setup requires. If someone doesn't like this approach to the testbench, I am open to changes, BUT I thank ask that someone to actually contribute running code to make it happen. Good advise is good, but doesn't help getting things done. Thanks again for all comments, I think they have considerable helped move forward. Sorry that I could not accept all suggestions. I guess it's like always in live: not everybody can be happy. But I hope we have achieved a sufficient level of overall happiness :-) Rainer 2014-12-17 19:20 GMT+01:00 David Lang <[email protected]>: > Sounds like we need a bug filed with github. We can't be the only folks > running into this sort of problem. > > David Lang > > On Tue, 16 Dec 2014, Rainer Gerhards wrote: > > I even get a mail with the necessary git command for merge. But in the gui >> it looks unmerged. Given all those long discussion we had on encouraging >> contributions, this looks like a "I won't merge anything" attitude which >> tends to scare potential new contributors away. >> >> Sent from phone, thus brief. >> Am 16.12.2014 21:33 schrieb "Tait Clarridge" <[email protected]>: >> >> Is the information visible in the pull request so that the merge can be >>>> >>> done >>> >>>> manually? or is all of this hidden in the GUI? >>>> >>>> >>> The requestor username and branch is visible in the GUI. >>> >>> An example title line looks like: "oldmantaiter wants to merge 1 >>> commit into rsyslog:master-omkafka from oldmantaiter:omkafka-merge" >>> >>> So yes, you could remote add https://github.com/oldmantaiter/rsyslog >>> and then pull omkafka-merge in the above case. >>> _______________________________________________ >>> 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. >> >> _______________________________________________ > 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.
