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

[Doug Schaefer <dschaefer@xxxxxxx>]

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