Re: [ptp-dev] Merge policy reminder

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]

Re: [ptp-dev] Merge policy reminder

From: Jeffrey Overbey <jeffreyoverbey@xxxxxxx>
Date: Fri, 10 Feb 2012 09:26:19 -0600
Delivered-to: ptp-dev@xxxxxxxxxxx
List-archive: <https://dev.eclipse.org/mailman/private/ptp-dev>
List-help: <mailto:ptp-dev-request@eclipse.org?subject=help>
List-subscribe: <https://dev.eclipse.org/mailman/listinfo/ptp-dev>, <mailto:ptp-dev-request@eclipse.org?subject=subscribe>
List-unsubscribe: <https://dev.eclipse.org/mailman/options/ptp-dev>, <mailto:ptp-dev-request@eclipse.org?subject=unsubscribe>

> At that point I find that someone has committed
> something to ptp_5_0 but not merged. Git does not allow selective merging,
> so I can either merge everything or nothing.

Would switching to a cherry-pick merge policy eliminate this problem?

Jeff

Follow-Ups:
- Re: [ptp-dev] Merge policy reminder
  - From: Greg Watson

References:
- Re: [ptp-dev] Merge policy reminder
  - From: Dave Wootton
- Re: [ptp-dev] Merge policy reminder
  - From: Greg Watson
- Re: [ptp-dev] Merge policy reminder
  - From: Jeffrey Overbey
- Re: [ptp-dev] Merge policy reminder
  - From: Greg Watson

Prev by Date: Re: [ptp-dev] Merge policy reminder
Next by Date: Re: [ptp-dev] Merge policy reminder
Previous by thread: Re: [ptp-dev] Merge policy reminder
Next by thread: Re: [ptp-dev] Merge policy reminder
Index(es):
- Date
- Thread

Breadcrumbs