Ha, that's interesting.  Normally I don't merge changes to .build_number between branches since each branch theoretically has its own build number.  But that's generally for branches that are intended for some form of release and the kohana_3 branch isn't really headed that way.

I'm embarrassed to say that I have a client set up to do this, but I don't remember how I set it up.  I think it has to do with putting:

```
[merge "merge-keep-ours"]
        name = Keep ours
        driver = git-merge-ours %O %A %B
```

in my .git/config - but that looks like it would keep the local copy in case of all conflicts.  Come to think of it, that might actually work in the case where we're merging master down to a release branch since we typically don't do any real work in release branches.

Anyway - other funny thing is that if we merge this file down to kohana_3 we can relatively easily see when we have another merge to do...