circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
pull/1/head
Thomas Adam 2012-09-24 18:03:04 +01:00
parent e342304134
commit 253f1395a0
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SYNCING
View File

@ -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: