[Sbs_software] FYI: "uconn_dev" branch merged back into "master"

[Andrew Puckett]

PS--If you have new (tested, stable) geometries or other developments in 
branches of g4sbs /other than /"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.

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:

git checkout mybranch

git merge master

....resolve any conflicts and test changes....

git push origin mybranch

git checkout master

git merge mybranch

....test any changes....

git push origin master

See the "git merge" documentation here: https://git-scm.com/docs/git-merge

See you at JLab next week!

Best regards,

Andrew


On 2/20/19 3:09 PM, Andrew Puckett wrote:
> Hello all,
>
> 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.
>
> 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.
>
> Best regards,
>
> Andrew
>
-- 
Andrew Puckett
Assistant Professor, Department of Physics, University of Connecticut
2152 Hillside Road, U-3046
Storrs, CT 06269-3046
E-mail: puckett at jlab.org, puckett at phys.uconn.edu
Office phone: 860-486-7137
Homepage: https://puckett.physics.uconn.edu

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://mailman.jlab.org/pipermail/sbs_software/attachments/20190220/42e25dd8/attachment.html>