>>>>> "Alex" == Alex Riesen <raa.lkml@xxxxxxxxx> writes: Alex> Wont work for new files (not yet known to git) which conflict with the Alex> same names from origin. Your method will not put them anywhere and Alex> their presence will break git-rebase. You _must_ do a merge. So I missed git-add for those. Then it'll work. I guess I implied that the git-commit initial step should capture all of the "interesting" state. git-rebase *will* do the merge. It must. :) -- Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095 <merlyn@xxxxxxxxxxxxxx> <URL:http://www.stonehenge.com/merlyn/> Perl/Unix/security consulting, Technical writing, Comedy, etc. etc. See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training! - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
