Fabio Comolli wrote: > Doesn't apply to today Linus' git tree: > > [fcomolli@tycho linux-2.6]$ git pull git://htj.dyndns.org/libata-tj > spindown > remote: Generating pack... > remote: Done counting 14283 objects. > remote: Result has 11254 objects. > remote: Deltifying 11254 objects. > remote: 100% (11254/11254) done > Indexing 11254 objects. > remote: Total 11254 (delta 9842), reused 11241 (delta 9832) > 100% (11254/11254) done > Resolving 9842 deltas. > 100% (9842/9842) done > 1948 objects were added to complete this thin pack. > 100% (44114/44114) done > Auto-merged Documentation/feature-removal-schedule.txt > CONFLICT (content): Merge conflict in > Documentation/feature-removal-schedule.txt > Automatic merge failed; fix conflicts and then commit the result. > > I don't know git enough to identify the conflict. Can anyone help me? That's a conflict in feature-removal-schedule.txt document. Open the file, look for <<<< or >>>> and fix them up, do "git-update-index Documentation/feature-removal-schedule.txt" followed by "git commit" and you should be done. Alternatively, you can just test the spindown branch as-is by doing 'git-fetch git://htj.dyndns.org/libata-tj spindown:spindown', then 'git checkout spindown'. -- tejun - To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
