[jira] [Commented] (MESOS-4119) Add support for enabling --3way to apply-reviews.py.

["Zhitao Li (JIRA)" <ji...@apache.org>]

    [ https://issues.apache.org/jira/browse/MESOS-4119?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15830749#comment-15830749 ] 

Zhitao Li commented on MESOS-4119:
----------------------------------

https://reviews.apache.org/r/55732/

> Add support for enabling --3way to apply-reviews.py.
> ----------------------------------------------------
>
>                 Key: MESOS-4119
>                 URL: https://issues.apache.org/jira/browse/MESOS-4119
>             Project: Mesos
>          Issue Type: Task
>            Reporter: Artem Harutyunyan
>              Labels: mesosphere, newbie
>
> Currently if {{git apply}} fails during apply-reviews, then the change must be rebased and re-uploaded to reviewboard in order for apply-reviews to succeed.
> However, it is often the case that {{git apply --3way}} will succeed since the blob information is included in the diff. Even if it doesn't succeed it will leave conflict markers, which allows the committer to do a manual conflict resolution if desired, or abort if conflict resolution is too difficult.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)