From 253f1395a03b7b3371799055a7e3a442a8fa7ba6 Mon Sep 17 00:00:00 2001 From: Thomas Adam Date: Mon, 24 Sep 2012 18:03:04 +0100 Subject: [PATCH] Don't rely on "-s ours" for merging The ours strategy assumes one subsumes the other -- which isn't the case for the portable version, so for now -- just go back to using the default merge strategy of recursive, and fix-up any conflicts manually. --- SYNCING | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/SYNCING b/SYNCING index 70e532c1..d32a8c60 100644 --- a/SYNCING +++ b/SYNCING @@ -113,11 +113,9 @@ portable: % git log master..obsd-master -From there, the merge should be a fast-forward, using the OURS strategy to -tell git that conflicts coming from OpenBSD respect the existing code in -tmux where those conflicts wouldn't arise. Hence: +From there, merge the result in, fixing up any conflicts which might arise. -% git merge -s ours obsd-master +% git merge obsd-master Then ensure things look correct by BULDING the result of that sync: