 |
 |
Hi Bill Nice! I created the branch for you. The reason you couldn't create it is that only tickets/XXXX format is allowed. You will be able to merge. You have a single commit there (good). Do you know how to make it available in the new branch? (It is simply git cherry-pick c428e6a34, I am assuming things are already merged with the tip of the master) thanks, Jacek On 01/25/2014 04:35 PM, Bill Chickering wrote: > Greetings - > > I'm ready to merge tickets 2531, 3019, and 3020 (fault tolerance and logging) into the master branch. I have a personal branch (pushed to the repo) called u/bchick/3020_singleCommit that is a copy of the master branch with the addition of a single commit containing all of my changes. > > A few questions: > > 1) I believe we want a new branch named tickets/3020a, or something similar, that is a duplicate of u/bchick/3020_singleCommit. It appears I lack the permissions to create this. Can someone either grant me the necessary permissions or create this branch for me? > > 2) Once this new branch (e.g. tickets/3020a) is created, it will need to be merged into the master branch. I'm guessing that I lack permission to perform this operation as well. Assuming I'm correct, can someone either grant me the necessary permissions or perform the merge (a simple fast-forward) for me? > > 3) The following branches are now deprecated: > tickets/2531 > tickets/3019 > tickets/3020 > What should we do with these? Delete them? > > Thanks! > Bill > ######################################################################## > 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 > ######################################################################## 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