Margarida Castro Neves <[log in to unmask]> writes:
> On 15 Feb 2017, at 17:26, Ole Streicher <[log in to unmask]>
> wrote:
>> I just discovered that there are currently two Starjava
>> repositories:
>
> It’s my fault :)
>
> https://github.com/SPLAT-VO/starjava is the one I use for my own
> development - to avoid messing up with the main repository.
> It’s used by myself and by Petr Skodas team to coordinate our efforts
> (beta releases).
> I try to merge my changes from my repository to the Starlink/Starjava
> repository once or twice a year when I have a good working version.
>
> I think you should concentrate in packaging using the Starlink
> repository. My changes on SPLAT will go there when they’re ready.
OK, thank you very much for the explanation. This is good to hear, I
am happy with that.
I would however recommend (for your own convenience) to use the github
workflow for your development:
1. create a "fork" of starjava in your own repository
2. For each new development step, create a new branch and push this to
your fork. Once you are somehow ready with the step, create a pull
request from that branch into the main repository. Depending on
whether you have write access to the main repository, you can then
merge yourself, or request a merge from someone who has access. The
nice thing about the pull request is that you have the whole diff
there, and that you can add and change commits during the discussion.
3. Once the pull request is merged, you can delete the development
branch (and start the next one).
I would also recommend to put the issues not into the fork, but into the
main repository, maybe prefixed with [splat] or so (or use labels for
that), and to advertize the starlink/starjava repo as the development
one. But, again, these are just recommendations, I am already happy that
splat will not diverge.
Best regards
Ole
|