Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [cdt-dev] Automatically resolve conflicts for CDT in Gerrit

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.


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

Back to the top