Stream: cds hooks/committers
Topic: docs / PR #132 Prefetch Clarifications
Github Notifications (Dec 22 2017 at 01:15):
bakerdb opened PR #132
from patch-8
to master
Clarification of issues discussed w.r.t. prefetch, it's need to be pre-negotiated, and the architectural dependence of its implementation. Responds to risk R3.
Github Notifications (Jan 22 2018 at 21:18):
brynrhodes review_requested PR #132
Github Notifications (Jan 22 2018 at 21:26):
kpshek synchronized PR #132
Github Notifications (Jan 24 2018 at 01:10):
bakerdb synchronized PR #132
Github Notifications (Jan 24 2018 at 01:21):
I tried to resolve the conflicts (deleted all from patch-8, retaining master), but saw no way to save these decisions. Maybe I don't have the right access privileges?
Github Notifications (Jan 24 2018 at 06:36):
kpshek synchronized PR #132
Github Notifications (Jan 24 2018 at 15:26):
I tried to resolve the conflicts (deleted all from patch-8, retaining master), but saw no way to save these decisions. Maybe I don't have the right access privileges?
You should be able to resolve the conflicts yourself by update your branch against the latest master. However, I can just resolve the conflicts when I merge this to master too.
Github Notifications (Jan 24 2018 at 16:34):
I could delete the patch-8 options (leaving the master options) in #132, but the “Mark as Resolved” button is not active.
-Dixie
Dixie B. Baker, Ph.D.
Senior Partner
Martin, Blanck and Associates
Office (Redondo Beach, CA): 310-791-9671
Mobile: 310-279-2579On Jan 24, 2018, at 7:26 AM, Kevin Shekleton <notifications@github.com<mailto:notifications@github.com>> wrote:
I tried to resolve the conflicts (deleted all from patch-8, retaining master), but saw no way to save these decisions. Maybe I don't have the right access privileges?
You should be able to resolve the conflicts yourself by update your branch against the latest master. However, I can just resolve the conflicts when I merge this to master too.
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub<https://github.com/cds-hooks/docs/pull/132#issuecomment-360170446>, or mute the thread<https://github.com/notifications/unsubscribe-auth/AKQxHSe8Au1tiZn89LfCMzTu5whaqbDIks5tN0u_gaJpZM4RKihn>.
Github Notifications (Jan 24 2018 at 16:47):
kpshek synchronized PR #132
Github Notifications (Jan 25 2018 at 05:15):
kpshek synchronized PR #132
Github Notifications (Jan 25 2018 at 05:51):
With all of the conflicts between these changes and #136 and my errors in trying to resolve the merge conflicts, I think it will be easier to simply review these changes on a clean PR: #145.
Github Notifications (Jan 25 2018 at 05:51):
kpshek closed PR #132
Last updated: Apr 12 2022 at 19:14 UTC