| 1 |
On Thu, May 31, 2012 at 01:48:29PM -0400, Rich Freeman wrote: |
| 2 |
> On Thu, May 31, 2012 at 12:49 PM, Robin H. Johnson <robbat2@g.o> wrote: |
| 3 |
> > 1. |
| 4 |
> > Discussion on merge policy. Originally I thought we would disallow merge |
| 5 |
> > commits, so that we would get a cleaner history. However, it turns out that if |
| 6 |
> > the repo ends up being pushed to different places with slightly different |
| 7 |
> > histories, merges are absolutely going to be required to prevent somebody from |
| 8 |
> > having to rebase at least one of their sets of commits that are already pushed. |
| 9 |
> |
| 10 |
> Not sure I'm following, but I will be the first to admit that I'm a |
| 11 |
> git novice. Would this be aided by a convention, like only committing |
| 12 |
> to master on the gentoo official repository, and any on-the-side work |
| 13 |
> on places like github/etc stays in branches? Those repositories would |
| 14 |
> just keep getting fed commits on master from the official repository. |
| 15 |
|
| 16 |
Iagree with this; I think we should ban merge commits on master. That |
| 17 |
would force everyone to rebase their work on current master before they |
| 18 |
commit to master which would make the history clean. |
| 19 |
|
| 20 |
William |
Archives