I think that the best way to deal with this is to have your stuff in a different branch in Git. Now when you want to upgrade you can always update the branch tracking gerrit&#39;s master branch, and then try to merge (or rebase) your branch with this.<div>
<br></div><div>Now comes the tricky part, you will face a series of merge conflicts which you have to fix. If that&#39;s done its working again!<br><br><div class="gmail_quote">On Tue, Mar 12, 2013 at 7:03 PM, Yury Katkov <span dir="ltr">&lt;<a href="mailto:katkov.juriy@gmail.com" target="_blank">katkov.juriy@gmail.com</a>&gt;</span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi guys! <div><br></div><div>We have about 30 extensions in our platform and we really try hard not to modify MediaWiki and the extensions that weren&#39;t made by us. Unfortunately sometimes we have to modify them and even more regretfully we don&#39;t send the patches to vendors immediately. </div>


<div>The result is obvious and sad - the vendors continue to develop their extensions and at one inevitable moment we have to deal with upgrading and merging. :-( </div><div><br></div><div>We&#39;re using git to store all the code and it doesn&#39;t allow the nested .git directories to be presented in the same project. </div>


<div><br></div><div>How do you deal with that? Do you use git submodules, separate repositories for the patched extensions or some fancy policy and documentation? </div><div><div><br></div><div>-----<br>Yury Katkov, WikiVote<br>


<br></div>
</div>
<br>_______________________________________________<br>
Mediawiki-enterprise mailing list<br>
<a href="mailto:Mediawiki-enterprise@lists.wikimedia.org">Mediawiki-enterprise@lists.wikimedia.org</a><br>
<a href="https://lists.wikimedia.org/mailman/listinfo/mediawiki-enterprise" target="_blank">https://lists.wikimedia.org/mailman/listinfo/mediawiki-enterprise</a><br>
<br></blockquote></div><br><br clear="all"><div><br></div>-- <br>Cheers,<br><br>Nischay Nahata<br><a href="http://nischayn22.in" target="_blank">nischayn22.in</a>
</div>