-
Notifications
You must be signed in to change notification settings - Fork 34
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Refactor extensions infrastructure #198
Conversation
@dannygoldstein I don't see the branch merging logic anywhere; could you point me to it? |
I thought the plan was for that to happen in the submodules, and just update the pins to the submodules as we have been doing already in this repo. |
The plan was to have the Extensions live in individual branches of the fritz SkyPortal fork named We need to do the merge somewhere, and there's no other natural place for the associated tool/script to live other than in fritz. I also don't think we want to demand that, each time an extension branch gets updated, the author also has to go and refresh the fritz master skyportal branch. |
This is what I tried to describe in step (3) here, but it may not have been clear: |
How are merge conflicts handled in this case?
…On Thu, Mar 11, 2021 at 4:44 PM Stefan van der Walt < ***@***.***> wrote:
This is what I tried to describe in step (3) here, but it may not have
been clear:
#87 (comment)
<#87 (comment)>
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#198 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAVEFYB6PJG2AHTRKHZD2SLTDFIUNANCNFSM4ZBFYK7A>
.
--
Danny Goldstein
http://astro.caltech.edu/~danny
|
The branches have to be kept in a consistent state. I suppose a CI-step on the fritz/skyportal repo would run the merge tool and check whether that is the case or not. There could be cases in which extensions touch the same files around the same places, but I don't think we're there yet. |
OK @stefanv, will implement.
…On Thu, Mar 11, 2021 at 5:04 PM Stefan van der Walt < ***@***.***> wrote:
The branches have to be kept in a consistent state. I suppose a CI-step on
the fritz/skyportal repo would run the merge tool and check whether that is
the case or not.
There could be cases in which extensions touch exactly the same file
around the same place, but I don't think we're there yet.
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#198 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAVEFYCFUUOX2NV4SN3ZJRTTDFLAVANCNFSM4ZBFYK7A>
.
--
Danny Goldstein
http://astro.caltech.edu/~danny
|
c538c97
to
c92ea38
Compare
b76ac3f
to
b9a6694
Compare
Given the age of this PR and that things seem to run OK as is, I will close this for now. Feel free to reopen as needed. |
This PR implements the extensions infrastructure described in #87 (comment).