[InterMine Dev] master vs. intermine-1.1 branch?

Julie Sullivan julie at flymine.org
Tue Oct 30 15:34:49 GMT 2012



On 30/10/12 15:33, Sierra Moxon wrote:
> 'git status' also shows some good info about where you are with regard to master.
>
> I was wondering what your policy is, Julie for making bug fixes to 1.1? Will
> they just get checked into master?

Yes!

And, how will we know when to update master
> for bug fixes?

For 1.0 we would email this list when we checked in bugs. Maybe do the same?

Still getting used to git too...
>
> thanks,
> Sierra
>
> On Oct 30, 2012, at 2:19 AM, Julie Sullivan wrote:
>
>> Hi JD,
>>
>> No problem, we're still getting used to the new way of doing things with Git.
>>
>> You should only ever use the master branch, that's the most up-to-date release
>> of InterMine. Currently that is release 1.1 (beta).
>>
>> Here's the docs on what to do:
>>
>> http://intermine.org/wiki/Git
>>
>> The InterMine developers here in Cambridge work off of the dev branch with
>> occasional other branches made for certain bugs or features. We also make a
>> branch for the release candidate (eg. release-intermine-1.1), this branch is
>> for beta testing and will be deleted next week when we make the formal 1.1
>> release.
>>
>> If you want to start working off of 1.0 instead of 1.1, you can check out the
>> latest 1.0 tag:
>>
>> https://github.com/intermine/intermine/tree/intermine-1.0.1
>>
>> Cheers
>> Julie
>>
>> On 29/10/12 22:12, JD Wong wrote:
>>> Hi Julie,
>>>
>>> Sorry if I missed this but I was wondering if the new release of intermine
>>> always replaces the old one in master branch, or if a new branch is created
>>> for it. On a related note, to get 1.1 do I have to pull from the
>>> release-intermine-1.1 branch?
>>>
>>> Also, how can you check what version of intermine the files on my server
>>> are at. Is it in a config file somewhere?
>>>
>>> Thanks!
>>> -JD
>>>
>>
>> _______________________________________________
>> dev mailing list
>> dev at intermine.org
>> http://mail.intermine.org/cgi-bin/mailman/listinfo/dev
>
>



More information about the dev mailing list