 |
 |
Hello Jacek, Thanks for your proposal, I would be happy to know more about this. Cheers, Fabrice On 05/16/2014 08:08 PM, Jacek Becla wrote: > Fabrice > > We talked about it at the Dev week, and we decided it'd > be good to try and keep the git history clean for Qserv. > > Let's try to find 15 min or so next Wed to talk > about how to properly merge branches into master. > > It looks like you merged a branch that was not fully > up to date with the tip of the master. I'd also recommend > to always check how things look like (with gitk) after you > merge and before you push to the main repo (you can always > back of if things look unclean before pushing it to the > master). I've gone through these pains and mistakes, I'd > like to teach you how to maneuver through all this :) > > Thanks > Jacek ######################################################################## 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