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

Re: Question about git

From: Behdad Esfahbod <behdad behdad org>
To: Shaun McCance <shaunm gnome org>
Cc: Simos Xenitellis <simos lists googlemail com>, Gnome i18n <gnome-i18n gnome org>
Subject: Re: Question about git
Date: Tue, 05 May 2009 11:41:21 -0400

On 05/05/2009 01:28 AM, Shaun McCance wrote:

This assumes that the branch is merged into master otherwise.  I strongly
suggest cherry-pick instead of merge.


Isn't that going to cause merge conflicts for me the
maintainer when I try to merge from my stable branches
to master?  I can pretty much guarantee I will always
do that.  If I have to deal with merge conflicts from
one of 100 translations each time, I'm not going to
be happy.

I *think* if the same commit exists in the destination, it doesn't cause amerge conflict. But I didn't test it to make sure right now.


behdad

Follow-Ups:
- Re: Question about git
  - From: Simos Xenitellis

References:
- Question about git
  - From: Milo Casagrande
- Re: Question about git
  - From: Gil Forcada
- Re: Question about git
  - From: Simos Xenitellis
- Re: Question about git
  - From: Behdad Esfahbod
- Re: Question about git
  - From: Shaun McCance

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