git remote add ssk ../SignalServiceKit git remote update git merge -s ours --allow-unrelated-histories --no-commit ssk/master git read-tree --prefix=SignalServiceKit -u ssk/master git commit |
||
|---|---|---|
| .. | ||
| TSContactThread.h | ||
| TSContactThread.m | ||
| TSGroupThread.h | ||
| TSGroupThread.m | ||