Re: [cdt-dev] Automatically resolve conflicts for CDT in Gerrit

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

Re: [cdt-dev] Automatically resolve conflicts for CDT in Gerrit

From: Paul Webster <pwebster@xxxxxxxxxxxxxxxxxxx>
Date: Mon, 25 Mar 2013 09:45:54 -0400
Delivered-to: cdt-dev@xxxxxxxxxxx
List-archive: <https://dev.eclipse.org/mailman/private/cdt-dev>
List-help: <mailto:cdt-dev-request@eclipse.org?subject=help>
List-subscribe: <https://dev.eclipse.org/mailman/listinfo/cdt-dev>, <mailto:cdt-dev-request@eclipse.org?subject=subscribe>
List-unsubscribe: <https://dev.eclipse.org/mailman/options/cdt-dev>, <mailto:cdt-dev-request@eclipse.org?subject=unsubscribe>

On Mon, Mar 25, 2013 at 9:34 AM, Sergey Prigogin <eclipse.sprigogin@xxxxxxxxx> wrote:

What would "Fast Forward Only" do when the same file changed in a patch and in the corresponding branch, but the changes are in different parts of the file?

AFAIK Fast Forward Only means that Gerrit will only merge the patch if it will be a FF merge (so the commit is already based off of master). It means the committer has to have rebased the commit already.

PW

--
Paul Webster
Hi floor. Make me a sammich! - GIR

Follow-Ups:
- Re: [cdt-dev] Automatically resolve conflicts for CDT in Gerrit
  - From: Sergey Prigogin

References:
- [cdt-dev] Automatically resolve conflicts for CDT in Gerrit
  - From: Sergey Prigogin
- Re: [cdt-dev] Automatically resolve conflicts for CDT in Gerrit
  - From: Doug Schaefer
- Re: [cdt-dev] Automatically resolve conflicts for CDT in Gerrit
  - From: Sergey Prigogin

Prev by Date: Re: [cdt-dev] Automatically resolve conflicts for CDT in Gerrit
Next by Date: Re: [cdt-dev] Automatically resolve conflicts for CDT in Gerrit
Previous by thread: Re: [cdt-dev] Automatically resolve conflicts for CDT in Gerrit
Next by thread: Re: [cdt-dev] Automatically resolve conflicts for CDT in Gerrit
Index(es):
- Date
- Thread

Breadcrumbs