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

Thanks, Shawn.

On Mon, Mar 25, 2013 at 10:42 AM, Shawn Pearce <sop@xxxxxxxxxx> wrote:
I think you need the "Automatically resolve conflicts" box checked.
I just looked at a few projects under cdt/ and this is false.
Its true in e.g. jgit/jgit.

On Mon, Mar 25, 2013 at 10:11 AM, Sergey Prigogin
<eclipse.sprigogin@xxxxxxxxx> wrote:
> The problem we were experiencing is that rebase would fail in Gerrit, but
> succeed without user intervention in EGit.
> -sergey
> On Mon, Mar 25, 2013 at 6:45 AM, Paul Webster <pwebster@xxxxxxxxxxxxxxxxxxx>
> wrote:
>> 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
>> _______________________________________________
>> cdt-dev mailing list
>> cdt-dev@xxxxxxxxxxx

Back to the top