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

[Sergey Prigogin <eclipse.sprigogin@xxxxxxxxx>]

I talked to Shawn Pearce yesterday and he explained to me that this option enables the same kind of automatic merge as the one done in EGit. Without this option contributors have to rebase locally and upload a new patch even when the rebase is automatic. Nathan Ridge and few others hit that several times. 

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?

-sergey

On Mon, Mar 25, 2013 at 6:21 AM, Doug Schaefer <dschaefer@xxxxxxx> wrote:

Is that a safe choice? I always thought it was better if the contributor resolved the conflicts locally. Or are these conflicts simple enough that they can be done automatically? 

Sent from my BlackBerry 10 smartphone on the Rogers network.

From: Sergey Prigogin

Sent: Monday, March 25, 2013 9:05 AM

To: Denis Roy

Reply To: CDT General developers list.

Cc: CDT General developers list.

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

Denis,

Could you please do me a favor and enable Automatically resolve conflicts at https://git.eclipse.org/r/#/admin/projects/cdt/org.eclipse.cdt.master.

Thanks a lot.

-sergey

_______________________________________________
cdt-dev mailing list
cdt-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/cdt-dev