Hi, Rocky Bernstein wrote: > I was thinking that Pete would do the merge since he also has commit rights > after the two of you decide that it is time to merge
Everybody is more qualified as git admin than i am. Pete Batard wrote: > Actually I don't mind if you guys sort it out as last time I checked (a > couple years ago), I had lost my ssh access right (which means that right > now I'm just using https to clone the repo) and I'm a bit busy with other > stuff ATM. This explains why you sent patches instead of preparing branches. So somebody must tell me what to do exactly for merging. (I read man git-merge but would prefer to succeed on the first try.) Rocky Bernstein wrote: > Ok. Just give me the SHA1 of the code that you'd like to see in master and > I will test it as well. And assuming everything works and it looks like > what has been mentioned here, I will merge it and let everyone know. Or that way. :)) The two branches "pete_batard_ce_v3" and "pete_batard_gcc_warnings" differ from "master" only by the three patches from Pete. pete_batard_ce_v3: commit 7896babce4a3fe3f27e733e4df3727f1e917bfd6 "Clean up rock.h and fix the use of char arrays in iso_su_ce_s" commit fdd76a8ee4f4f00f1eabc6f632322db800ee9970 "Add processing of Rock Ridge CE records" pete_batard_gcc_warnings: commit 569c452f8d1650c0ec50ebeef7869b54ed9c8be6 "Fix gcc warnings" Taken from git log of each branch. Next i will try to find out what's up with "joliet_multi_extent". Have a nice day :) Thomas
