Félix, please give me commit access to leoInteg

91 views
Skip to first unread message

Edward K. Ream

unread,
Jul 15, 2020, 6:24:54 PM7/15/20
to leo-editor
I'd like to push some work to a new branch.

Thanks.

Edward

Brian Theado

unread,
Jul 19, 2020, 4:34:13 PM7/19/20
to leo-editor

Edward,

On Wed, Jul 15, 2020 at 6:24 PM Edward K. Ream <edre...@gmail.com> wrote:
I'd like to push some work to a new branch.

Are you familiar with the "fork" workflow of github? Where you can create a fork of leoInteg in the 'leo-editor' github space and you can push whatever branch you want. That branch is publicly visible but only in your fork. If there is something useful you want to merge into Félix's repository, then you can create a pull request which would allow Feliix to merge from your forked branch into his repository. On your local leoInteg git repository, you can have a remote pointing to both his repository and your fork. That way you can easily merge his latest changes into your branch.

For the fork workflow you don't need commit access. It would be up to Félix to decide whether to merge the PR or not.

There are plenty of reasons to prefer direct commit access, but based on another recent email from you, I had my doubts whether you are fully familiar with how PRs work. This was the "Should devel be the default branch?" thread where you wrote:


I just received and rejected PR #1615. This PR was to be applied to 6.0-final-rel. That's not how things work. We don't change official releases for any reason.

> The author does not appear to have commit access, which is troubling.  However, the default branch is "master", not "devel", so perhaps that explains the situation.

Author's don't need commit access to create pull requests.

HTH,
Brian

Félix

unread,
Jul 19, 2020, 5:04:37 PM7/19/20
to leo-e...@googlegroups.com
Thanks Brian, 

My thought also.

btw I'm using this extension, recomended and made by the vscode dev team, to easily create and merge my own pull requests directly from vscode.  https://github.com/Microsoft/vscode-pull-request-github 

Its nice because it knows about the issues created on the github repo, and makes a new branch for me (from an issue#) and switches to it when I right-click on an issue and chose "Start working on this issue". 

Then, when im done, i can easily hit the "+" in the "create pull request" pane that  the extension provides, and then i just select what branch I wanna push my 'new-feature-issue#xx' back into. (which is normally 'dev', the branch from which to start working from when adding new features/collaborating)

So an example of collaboration would be creating a new issue, or choosing one already created, making a branch from dev naming it username/issue### , so that later when its done , make a 'pull request' out of it, to be merged back into dev.
--
Félix

Edward K. Ream

unread,
Jul 20, 2020, 6:25:38 AM7/20/20
to leo-editor
On Sun, Jul 19, 2020 at 4:04 PM Félix <felix...@gmail.com> wrote:

btw I'm using this extension, recomended and made by the vscode dev team, to easily create and merge my own pull requests directly from vscode.  https://github.com/Microsoft/vscode-pull-request-github 

I've just installed this plugin.

Edward

Edward K. Ream

unread,
Jul 20, 2020, 6:31:12 AM7/20/20
to leo-editor
On Sun, Jul 19, 2020 at 3:34 PM Brian Theado <brian....@gmail.com> wrote:

Are you familiar with the "fork" workflow of github?

I am now :-)

Félix's dev branch is protected, so I'll use this if necessary to suggest additions to dev.

Edward

Edward K. Ream

unread,
Jul 21, 2020, 9:15:11 AM7/21/20
to leo-editor
On Sunday, July 19, 2020 at 3:34:13 PM UTC-5, btheado wrote:

There are plenty of reasons to prefer direct commit access, but based on another recent email from you, I had my doubts whether you are fully familiar with how PRs work.

I wasn't familiar then. I'll be using PR's from now on to suggest changes to Félix's project.

> Author's don't need commit access to create pull requests.

I see. The real problem was that the PR was based on master, not devel.

Edward
Reply all
Reply to author
Forward
0 new messages