On 3/5/2014 9:12 AM, Edward K. Ream wrote:
On Fri, Feb 14, 2014 at 8:43 AM, Kent Tenney <[email protected]
<mailto:[email protected]>> wrote:
The model I see out there tends to look like:
- Edward is in charge of the codebase
- he approves "lieutenants" who can merge into trunk
- the rest of us issue pull requests, Edward or a lieutenant
approves or denies
I've been meaning to get around to this discussion for awhile. Some
questions:
1. Is there an easy way for me to see all outstanding pull requests?
https://github.com/leo-editor/leo-editor/pulls
2. What exactly do I do to evaluate and merge a pull request?
You can click on the names of those pull requests on the above page, and
in the top there is a tab for 'Files Changed' that acts as a visual
diff. You can merge the pull request on the 'Conversation' tab if it's
possible to do it automatically (most pull-requests shouldn't conflict
with code in master), or you'll have to do it on the command line for
more extensive jobs.
It should be noted that pull-requests are an addition to git that live
outside of git -- they're a github-added feature. The git cli can merge
them, but it doesn't know where they live -- only github does (to my
knowledge).
-->Jake
Edward
--
You received this message because you are subscribed to the Google
Groups "leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send
an email to [email protected]
<mailto:[email protected]>.
To post to this group, send email to [email protected]
<mailto:[email protected]>.
Visit this group at http://groups.google.com/group/leo-editor.
For more options, visit https://groups.google.com/groups/opt_out.
--
You received this message because you are subscribed to the Google Groups
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To post to this group, send email to [email protected].
Visit this group at http://groups.google.com/group/leo-editor.
For more options, visit https://groups.google.com/groups/opt_out.
