[Vtigercrm-developers] Vtiger 7.1 RC Released

Prasad prasad at vtiger.com
Wed Jan 31 06:33:41 GMT 2018


NOTE: Pull-request should be validated well and expected to be in sync with
master.

--
FB <http://www.facebook.com/vtiger> I Twit <http://twitter.com/vtigercrm> I
LIn <https://www.linkedin.com/company/1270573?trk=tyah> I Blog
<https://blogs.vtiger.com> I Website <https://www.vtiger.com/>

On Wed, Jan 31, 2018 at 11:48 AM, nilay khatri <nilay.spartan at gmail.com>
wrote:

> We have been working on git since a long and until now following setup has
> worked:
>
> 1. For major each issue create a separate branch
> 2. Have a staging/Dev branch (for each version release). As an issue is
> fixed, send a merge request to the Staging Branch
> 3. Perform all testing on the staging branch
> 4. Once the staging has passed tests, merge it with the master and tag a
> new release version
>
>
> In such case, when some one wants to commit to master, they can send a
> merge request to the Staging Branch
>
> regards,
> Nilay Khatri
> Founder, Automate SMB
> *Vtiger CRM implementation/Customization | Sales and Marketing Automation *
>
>
> On Tue, Jan 30, 2018 at 10:26 PM, Prasad <prasad at vtiger.com> wrote:
>
>> Alan,
>>
>> master is the reference for any contribution.
>>
>> We fork branch to keep the work-in-progress copy or integration
>> that need to run with validation (and likely to break). Post stability on
>> sanity testing it would be merge into master.
>>
>> 7.1.0 - was a working branch which got pulled into master.
>>
>> Is there a better model you are recommending?
>>
>> Regards,
>> Prasad
>> Vtiger Team
>>
>>
>> --
>> FB <http://www.facebook.com/vtiger> I Twit <http://twitter.com/vtigercrm>
>>  I LIn <https://www.linkedin.com/company/1270573?trk=tyah> I Blog
>> <https://blogs.vtiger.com> I Website <https://www.vtiger.com/>
>>
>> On Tue, Jan 30, 2018 at 10:04 PM, Alan Lord <alanslists at gmail.com> wrote:
>>
>>> It would be helpful, I assume, to vtiger as well as to us, if you
>>> (vtiger) could explain what your procedure is with regards to the branches
>>> on Gitlab?
>>>
>>> I see a bunch of recent commits to "master". And nothing since
>>> 04/01/2018 to the branch called 7.1.0???
>>>
>>> Which one(s) are we supposed to track and test regularly? And what is
>>> the purpose of each one? Then we would know which branch(es) we should be
>>> submitting pull requests to :-)
>>>
>>> Right now it is very confusing...
>>>
>>> TIA
>>>
>>> Al
>>>
>>>
>>>
>>> On 10/01/18 13:39, Alan Lord wrote:
>>>
>>>> On 10/01/18 13:23, Satish Dvnk wrote:
>>>>
>>>>> Hi Alan,
>>>>>
>>>>> 7.1 was anticipated to have core-changes so we followed forked
>>>>> development and changes will be pushed master soon before the release.
>>>>>
>>>>
>>>> Thanks, but that doesn't really answer my questions...
>>>>
>>>>     What is the difference between the master branch and the 7.1.0
>>>>>     branch? Surely, until a version is actually "released" nothing
>>>>>     should be pushed to master? (And then I'd expect it would just be a
>>>>>     merge of the released status of the 7.1.0 branch or tag).
>>>>>
>>>>
>>>> and
>>>>
>>>>     Could one of you explain your procedure and what each branch really
>>>>>     signifies so we know which one we should be basing our development
>>>>>     and testing efforts against?
>>>>>
>>>>
>>> _______________________________________________
>>> http://www.vtiger.com/
>>
>>
>>
>> _______________________________________________
>> http://www.vtiger.com/
>>
>
>
> _______________________________________________
> http://www.vtiger.com/
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.vtigercrm.com/pipermail/vtigercrm-developers/attachments/20180131/8a6b2c94/attachment-0001.html>


More information about the vtigercrm-developers mailing list