On 1/30/14, 1:25 , Fabrice Jammes wrote:
> Hello Bill,
>
> The LSST merge procedure is described here :
> https://dev.lsstcorp.org/trac/wiki/GitDemoAndTutorial#LSSTgitworkflowandbranchmanagementpolicy
> Could you please check that the final merge command is :
>
> git merge --no-ff tickets/3020a
>
> rather than :
>
> git merge tickets/3020a
>
Hi Fabrice,
Yes, it's the former (with --no-ff). That's there to ensure a merge
commit gets created (so it's easier to back out the merge in case of error).
(ps: it's not a catastrophe if one forgets to do it).
--
Mario Juric,
Data Mgmt. Project Scientist, Large Synoptic Survey Telescope
Web : http://research.majuric.org Phone : +1 617 744 9003
########################################################################
Use REPLY-ALL to reply to list
To unsubscribe from the QSERV-L list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=QSERV-L&A=1
|