[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: For dpkg translators: new git instructions

On Wed, 10 Oct 2007, Otavio Salvador wrote:
> > This command seems to apply the changes corresponding to the merge but not
> > record the merge as a merge, thus losing information concerning the
> > changes. It looks like this has the potential to hurt... please don't use
> > it. :)
> Sorry but you missunderstood it.

No I didn't. You misunderstood how translators are "merging". :-)

> For example, say branches:
>  master
>  foo
> and I've been commiting on foo for a while. Once my change is done, I
> can go to master and run: git merge --squash foo.

Indeed. But the translators don't work on their dedicated branches and
generally do not use (or even do not want to know) what a topic branch is.

Raphaël Hertzog

Premier livre français sur Debian GNU/Linux :

Reply to: