 <pre><code>git fetch /wp-contents/themes master git merge -s ours --no-commit FETCH_HEAD git read-tree --prefix=wp-contents/themes -u FETCH_HEAD git commit -m "message" </code></pre> <p>Actually i propose to merge directories manually and commit the changes.</p>