The branch, master has been updated
via 253f1395a03b7b3371799055a7e3a442a8fa7ba6 (commit)
from e342304134b8012ae62cb627dc9e322411dd48b1 (commit)
- Log -----------------------------------------------------------------
commit 253f1395a03b7b3371799055a7e3a442a8fa7ba6
Author: Thomas Adam <tho...@xteddy.org>
Commit: Thomas Adam <tho...@xteddy.org>
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 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/SYNCING b/SYNCING
index 70e532c..d32a8c6 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:
-----------------------------------------------------------------------
Summary of changes:
SYNCING | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
tmux-cvs mailing list
tmux-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
