You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@taverna.apache.org by NadeeshDilanga <gi...@git.apache.org> on 2016/05/22 16:47:38 UTC
[GitHub] incubator-taverna-common-activities pull request: dummy Docker act...
GitHub user NadeeshDilanga opened a pull request:
https://github.com/apache/incubator-taverna-common-activities/pull/3
dummy Docker activity
This is a testing. Suddenly remembered that I didn't do this. Please tell me if I'm doing this wrong.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/NadeeshDilanga/incubator-taverna-common-activities docker
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-taverna-common-activities/pull/3.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #3
----
commit 57e10e1de0d8782b753904f6117c5015fd3707af
Author: Stian Soiland-Reyes <st...@apache.org>
Date: 2016-04-24T18:45:38Z
dummy Docker activity
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-taverna-common-activities issue #3: dummy Docker activity
Posted by NadeeshDilanga <gi...@git.apache.org>.
Github user NadeeshDilanga commented on the issue:
https://github.com/apache/incubator-taverna-common-activities/pull/3
It looks good - but I think we'll put it the pull requests towards the `docker` branch rather than `master` so this doesn't get half-way into a release.
Could you change/reissue the pull request against that branch?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-taverna-common-activities issue #3: dummy Docker activity
Posted by stain <gi...@git.apache.org>.
Github user stain commented on the issue:
https://github.com/apache/incubator-taverna-common-activities/pull/3
@NadeeshDilanga - it's best to have one branch per pull request, otherwise all the open pull requests move ahead at the same pace.
Both this and #8 are fed from your `docker` branch, but this pull request should be closed as it asks to be merged into the Apache-side `master` instead of `docker`.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-taverna-common-activities issue #3: dummy Docker activity
Posted by stain <gi...@git.apache.org>.
Github user stain commented on the issue:
https://github.com/apache/incubator-taverna-common-activities/pull/3
@NadeeshDilanga if this pull request is now superseded by the merged #5, could you close this? Thanks!
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-taverna-common-activities issue #3: dummy Docker activity
Posted by NadeeshDilanga <gi...@git.apache.org>.
Github user NadeeshDilanga commented on the issue:
https://github.com/apache/incubator-taverna-common-activities/pull/3
Hi Stian,
I was sending pull requests on for different phases. Each pull request has
the diff of the particular phase. Means, I have 5 pull requests, and my
whole code is combination of all 5 pull requests.
Can you please explain on sending each pull request from different branches
? You want 5 pull requests, 1st one from branch_1, 2nd one from branch_2
like wise ? If that is the case, won't it going to create lot of branches
end of day. In that sense, shall I keep the code in my repo and at the time
of GSoC completion, I will send one pull request that has the entire
implementation ?
On Fri, Jun 24, 2016 at 10:12 AM, Stian Soiland-Reyes <
notifications@github.com> wrote:
> @NadeeshDilanga <https://github.com/NadeeshDilanga> - it's best to have
> one branch per pull request, otherwise all the open pull requests move
> ahead at the same pace.
>
> Both this and #8
> <https://github.com/apache/incubator-taverna-common-activities/pull/8>
> are fed from your docker branch, but this pull request should be closed
> as it asks to be merged into the Apache-side master instead of docker.
>
> \u2014
> You are receiving this because you were mentioned.
> Reply to this email directly, view it on GitHub
> <https://github.com/apache/incubator-taverna-common-activities/pull/3#issuecomment-228356411>,
> or mute the thread
> <https://github.com/notifications/unsubscribe/AKucK_GDNRtUk-stybU9XRjexZ6K93gaks5qO-XfgaJpZM4IkBmF>
> .
>
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-taverna-common-activities issue #3: dummy Docker activity
Posted by stain <gi...@git.apache.org>.
Github user stain commented on the issue:
https://github.com/apache/incubator-taverna-common-activities/pull/3
Hi, I'm OK with incremental pull requests, but the problem is that if you have multiple open pull requests from the same branch, then they are effectively the same pull requests and I wouldn't know which commit to review..
When you have a sizeable code, as in #8, then open a new pull request from a new "feature" branch on your GitHub repository. If we need to fix some small details for that pull requests, then you can fix it on that branch separately. We can then review this and merge it - while you keep working on something else.
For your continued work, you can then do that on a new feature branch, so you don't affect the pull request and we can review it without having a moving target. You might need to occasionally merge your older feature branches into the newer feature branches.
Obviously here you are not doing independent patches, you are building on your own work, and so you would base such new feature branches from your own feature branch, rather than the Apache branch (which might lag behind).
This is an area where GitHub pull requests start being difficult, because your newer pull request will build on the old one, so you can just say "Depends on #3") so they can be reviewed in order. But even if we do merge the later PR, then GitHub will figure out both PRs have been merged.
Your feature branches shouldn't be called "branch_1" etc, but rather refer either to a JIRA issue number or to the main fixed/new feature, e.g. `dockerjava` or `certificate-path`.
GitHub will tell you "You can safely delete this branch" once a pull request is accepted, just click the "Delete" branch there, and do `git branch -d` locally after pulling the new upstream.
No, I would not prefer a "One PR at the end of GSOC" approach :) Let's continue with small PRs so they are easy to review :)
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-taverna-common-activities pull request #3: dummy Docker activity
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/incubator-taverna-common-activities/pull/3
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---