<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body text="#000000" bgcolor="#FFFFFF">
<p>PS--If you have new (tested, stable) geometries or other
developments in branches of g4sbs <i>other than </i>"uconn_dev"
or "master" since the last major update that you would like to
have incorporated into the "master" branch and supported by the
g4sbs team, now would be a good time. </p>
<p>Since there have been many changes to master in the recent merge
(two years worth of uconn_dev commits), it is advisable to first
merge the new master branch into your development branch, resolve
any conflicts, push the result to your development branch, and
then switch to the master branch, and merge the result back into
master; i.e., if I am working in a branch called "mybranch", the
process would be something along the lines of: <br>
</p>
<p>git checkout mybranch</p>
<p>git merge master</p>
<p>....resolve any conflicts and test changes....</p>
<p>git push origin mybranch</p>
<p>git checkout master</p>
<p>git merge mybranch</p>
<p>....test any changes....<br>
</p>
<p>git push origin master</p>
<p>See the "git merge" documentation here:
<a class="moz-txt-link-freetext" href="https://git-scm.com/docs/git-merge">https://git-scm.com/docs/git-merge</a></p>
<p>See you at JLab next week! <br>
</p>
<p>Best regards,</p>
<p>Andrew<br>
</p>
<p><br>
</p>
<div class="moz-cite-prefix">On 2/20/19 3:09 PM, Andrew Puckett
wrote:<br>
</div>
<blockquote type="cite"
cite="mid:315ebef4-718c-c4d3-d797-c915b85171cc@jlab.org">Hello
all,
<br>
<br>
Just an FYI that I merged the "uconn_dev" branch of g4sbs back
into the "master" branch. "uconn_dev" has been the de facto master
branch for the last two years, as there has been very little (no?)
development in master since the last significant merge in summer
of 2016. Perhaps somewhat surprisingly, the merge encountered no
conflicts.
<br>
<br>
I decided to do this and also try to bring the documentation wiki
up to date a bit in advance of next week's collaboration meeting.
<br>
<br>
Best regards,
<br>
<br>
Andrew
<br>
<br>
</blockquote>
<pre class="moz-signature" cols="72">--
Andrew Puckett
Assistant Professor, Department of Physics, University of Connecticut
2152 Hillside Road, U-3046
Storrs, CT 06269-3046
E-mail: <a class="moz-txt-link-abbreviated" href="mailto:puckett@jlab.org">puckett@jlab.org</a>, <a class="moz-txt-link-abbreviated" href="mailto:puckett@phys.uconn.edu">puckett@phys.uconn.edu</a>
Office phone: 860-486-7137
Homepage: <a class="moz-txt-link-freetext" href="https://puckett.physics.uconn.edu">https://puckett.physics.uconn.edu</a></pre>
</body>
</html>