On 02/15/2011 03:58 PM, Martin Steigerwald wrote: > Yes. But I need to resolve on issue with a merge conflict with > git-import-orig > first. I already had this once and resolved it by manually marking which file > to > use. But apparently this wasn't a permanent fix. > > This time I want to fix it for real. I will ask Sebastian Harl for help > tomorrow, cause I do not know how to do it. In case you have an idea please > hint me at it. > > I think there shouldn't be a merge conflict at all or possibly only regarding > the makefile that I adapted. I guess there is something wrong with my master > branch on collab-maint/fio. It seems to think that all files were locally > changed which obviously is not true, cause I only adapted the Makefile (as in > debian patch).
I just did and it worked. No issues. I've pushed the changes to the repo. Have a look. I do have interest in fio. In case you need a co-maintainer, let me know. I can be part of it. Ritesh -- Ritesh Raj Sarraf | http://people.debian.org/~rrs Debian - The Universal Operating System
signature.asc
Description: OpenPGP digital signature
