diff options
| author | Thomas Adam <thomas@xteddy.org> | 2012-09-24 18:03:04 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2012-09-24 18:05:34 +0100 |
| commit | 253f1395a03b7b3371799055a7e3a442a8fa7ba6 (patch) | |
| tree | 63acaecc3becf3d980f1b197e4e6bcad49a86951 /SYNCING | |
| parent | e342304134b8012ae62cb627dc9e322411dd48b1 (diff) | |
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.
Diffstat (limited to 'SYNCING')
| -rw-r--r-- | SYNCING | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -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: |