On Tue, 16 Dec 2014, Tait Clarridge wrote:
On Tue, Dec 16, 2014 at 3:15 PM, David Lang <[email protected]> wrote:
On Tue, 16 Dec 2014, Rainer Gerhards wrote:
Is there any way I can work decently with pull requests with those
throw-away branches? Right now most are against master, wich means I need
to manually merge and it always looks like I closed unnerved. .
I think I'm missing something here. a pull request should just be the url of
the branch to pull in, you should be able to pull that in to any branch you
want, not just the one they forked from. Pulling in to a different branch
may generate more conflicts, but that can happen when other things have been
pulled into the branch they forked from as well.
It's possible that this is a github gui issue. I'm talking in terms of the
underlying git functionality.
David Lang
That's what it sounds like, from the Github GUI you cannot edit the
pull request to change the branch once it has been submitted which is
annoying.
From the command line you could set a remote for the pull requestor's
account and create some local throwaway branches for tests to run etc.
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?
There are also some automated CI tools (like Travis CI) that can run
tests against pull requests so you can see whether they pass those
before merging into the "staging" branch (master-candidate).
That's exactly the type of testing we are trying to do, but without having to
use their CI tool (since we already have tests and setting them up is
non-trivial)
David Lang
_______________________________________________
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.
