mesos-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Zhitao Li (JIRA)" <>
Subject [jira] [Commented] (MESOS-4119) Add support for enabling --3way to
Date Thu, 19 Jan 2017 22:50:27 GMT


Zhitao Li commented on MESOS-4119:

> Add support for enabling --3way to
> ----------------------------------------------------
>                 Key: MESOS-4119
>                 URL:
>             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

View raw message