Hi, in the kernel and barebox we avoid as much as possible the rebase as you loose information when you do so.
When you rebase you do not known against which commit the current pull request was tested This histary is important specially when you apply multiple pull request. If a pul conflit we try to resolve it but if it's too complex at that time we ask the one that send the pull request to rebase it's patches against the current tree Best Regards, J. On 06:53 Wed 10 Aug , Øyvind Harboe wrote: > I am genuinely interested in hearing the pros and cons of rebasing > vs. merging pull requests. > > rebasing yields a nice linear history, which I like. Perhaps I'm just > old fashioned and used to it from Subversion days... > > -- > Øyvind Harboe - Can Zylin Consulting help on your project? > US toll free 1-866-980-3434 / International +47 51 87 40 27 > http://www.zylin.com/ > _______________________________________________ > Openocd-development mailing list > Openocd-development@lists.berlios.de > https://lists.berlios.de/mailman/listinfo/openocd-development _______________________________________________ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development