<div dir="ltr"><div class="gmail_default" style="font-family:arial,helvetica,sans-serif">NOTE: Pull-request should be validated well and expected to be in sync with master.</div></div><div class="gmail_extra"><br clear="all"><div><div class="gmail_signature" data-smartmail="gmail_signature"><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr">--</div><div dir="ltr"><span style="border-collapse:collapse;font-family:arial,sans-serif;font-size:13px"><a href="http://www.facebook.com/vtiger" style="color:rgb(0,0,204)" target="_blank">FB</a> I </span><a href="http://twitter.com/vtigercrm" style="color:rgb(0,0,204)" target="_blank">Twit</a> I <a href="https://www.linkedin.com/company/1270573?trk=tyah" style="color:rgb(0,0,204)" target="_blank">LIn</a> I <a href="https://blogs.vtiger.com" style="color:rgb(0,0,204)" target="_blank">Blog</a> I <a href="https://www.vtiger.com/" style="color:rgb(0,0,204)" target="_blank">Website</a></div></div></div></div></div></div></div></div></div></div></div>
<br><div class="gmail_quote">On Wed, Jan 31, 2018 at 11:48 AM, nilay khatri <span dir="ltr"><<a href="mailto:nilay.spartan@gmail.com" target="_blank">nilay.spartan@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">We have been working on git since a long and until now following setup has worked:<div><br></div><div>1. For major each issue create a separate branch</div><div>2. Have a staging/Dev branch (for each version release). As an issue is fixed, send a merge request to the Staging Branch</div><div>3. Perform all testing on the staging branch</div><div>4. Once the staging has passed tests, merge it with the master and tag a new release version</div><div><br></div><div><br></div><div>In such case, when some one wants to commit to master, they can send a merge request to the Staging Branch</div></div><div class="gmail_extra"><br clear="all"><div><div class="m_-7636582346280909787gmail_signature" data-smartmail="gmail_signature"><div dir="ltr"><div><div dir="ltr"><span class="">regards,<div>Nilay Khatri</div><div>Founder, Automate SMB</div></span><span class=""><div><i style="font-size:x-small">Vtiger CRM implementation/Customization | Sales and Marketing Automation </i><br></div><div><br></div></span></div></div></div></div></div>
<br><div class="gmail_quote"><div><div class="h5">On Tue, Jan 30, 2018 at 10:26 PM, Prasad <span dir="ltr"><<a href="mailto:prasad@vtiger.com" target="_blank">prasad@vtiger.com</a>></span> wrote:<br></div></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div><div class="h5"><div dir="ltr"><div class="gmail_default" style="font-family:arial,helvetica,sans-serif">Alan,</div><div class="gmail_default" style="font-family:arial,helvetica,sans-serif"><br></div><div class="gmail_default" style="font-family:arial,helvetica,sans-serif">master is the reference for any contribution.</div><div class="gmail_default" style="font-family:arial,helvetica,sans-serif"><br></div><div class="gmail_default" style="font-family:arial,helvetica,sans-serif">We fork branch to keep the work-in-progress copy or integration</div><div class="gmail_default" style="font-family:arial,helvetica,sans-serif">that need to run with validation (and likely to break). Post stability on</div><div class="gmail_default" style="font-family:arial,helvetica,sans-serif">sanity testing it would be merge into master.</div><div class="gmail_default" style="font-family:arial,helvetica,sans-serif"><br></div><div class="gmail_default" style="font-family:arial,helvetica,sans-serif">7.1.0 - was a working branch which got pulled into master.</div><div class="gmail_default" style="font-family:arial,helvetica,sans-serif"><br></div><div class="gmail_default" style="font-family:arial,helvetica,sans-serif">Is there a better model you are recommending?</div><div class="gmail_default" style="font-family:arial,helvetica,sans-serif"><br></div><div class="gmail_default" style="font-family:arial,helvetica,sans-serif">Regards,</div><div class="gmail_default" style="font-family:arial,helvetica,sans-serif">Prasad</div><div class="gmail_default" style="font-family:arial,helvetica,sans-serif">Vtiger Team</div><div class="gmail_default" style="font-family:arial,helvetica,sans-serif"><br></div><div class="gmail_extra"><br clear="all"><div><div class="m_-7636582346280909787m_303980075760813253m_-4926527550586142616gmail_signature" data-smartmail="gmail_signature"><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr">--</div><div dir="ltr"><span style="border-collapse:collapse;font-family:arial,sans-serif;font-size:13px"><a href="http://www.facebook.com/vtiger" style="color:rgb(0,0,204)" target="_blank">FB</a> I </span><a href="http://twitter.com/vtigercrm" style="color:rgb(0,0,204)" target="_blank">Twit</a> I <a href="https://www.linkedin.com/company/1270573?trk=tyah" style="color:rgb(0,0,204)" target="_blank">LIn</a> I <a href="https://blogs.vtiger.com" style="color:rgb(0,0,204)" target="_blank">Blog</a> I <a href="https://www.vtiger.com/" style="color:rgb(0,0,204)" target="_blank">Websi<wbr>te</a></div></div></div></div></div></div></div></div></div></div></div><div><div class="m_-7636582346280909787h5">
<br><div class="gmail_quote">On Tue, Jan 30, 2018 at 10:04 PM, Alan Lord <span dir="ltr"><<a href="mailto:alanslists@gmail.com" target="_blank">alanslists@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">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?<br>
<br>
I see a bunch of recent commits to "master". And nothing since 04/01/2018 to the branch called 7.1.0???<br>
<br>
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 :-)<br>
<br>
Right now it is very confusing...<br>
<br>
TIA<br>
<br>
Al<span><br>
<br>
<br>
<br>
On 10/01/18 13:39, Alan Lord wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
On 10/01/18 13:23, Satish Dvnk wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Hi Alan,<br>
<br>
7.1 was anticipated to have core-changes so we followed forked development and changes will be pushed master soon before the release.<br>
</blockquote>
<br>
Thanks, but that doesn't really answer my questions...<br>
<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
What is the difference between the master branch and the 7.1.0<br>
branch? Surely, until a version is actually "released" nothing<br>
should be pushed to master? (And then I'd expect it would just be a<br>
merge of the released status of the 7.1.0 branch or tag).<br>
</blockquote>
<br>
and<br>
<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Could one of you explain your procedure and what each branch really<br>
signifies so we know which one we should be basing our development<br>
and testing efforts against?<br>
</blockquote></blockquote>
<br></span>
______________________________<wbr>_________________<br>
<a href="http://www.vtiger.com/" rel="noreferrer" target="_blank">http://www.vtiger.com/</a></blockquote></div><br></div></div></div></div>
<br></div></div>______________________________<wbr>_________________<br>
<a href="http://www.vtiger.com/" rel="noreferrer" target="_blank">http://www.vtiger.com/</a><br></blockquote></div><br></div>
<br>______________________________<wbr>_________________<br>
<a href="http://www.vtiger.com/" rel="noreferrer" target="_blank">http://www.vtiger.com/</a><br></blockquote></div><br></div>