On Wed, Aug 10, 2011 at 11:49 AM, Drasko DRASKOVIC <[email protected]> wrote: > What I'd like to avoid is this situation : you do development on your > independent branch, making many temporary commits which leave > temporary logs. These temporary logs should not be seen in the > official master's history, but only one commit/merge done by the > official maintainer. I think that merging a branch would show all your > temporary steps arriving to the final result...
Yes, you should rebase and clean up your commits (using squash for instance) before sending a pull request. And you should rebase it against the current master head, to reduce the risk of conflicts due to other commits applied to master since you created your commits. That is, you take care of any conflicts instead of handing them to the poor maintainer. If nothing has been committed to master in between, there will be no difference in the maintainer merging (which would then do a fast-forward to your tree) or rebasing them himself (which would then be pointless and just reset the dates of your commits). Or, if other things have been committed in between, at least the risk of conflicts has been minimized, and your commits will also follow each other in the git history after a merge. Cheers, Tormod _______________________________________________ Openocd-development mailing list [email protected] https://lists.berlios.de/mailman/listinfo/openocd-development
