git pull -r -Chad On Mar 12, 2014 6:33 AM, "Christoph Mitasch" <[email protected]> wrote:
> Hello, > > we are running Mediawiki with some small modifications (e.g. the > Vector.php skin). > > My plan was to checkout a specific branch (e.g. 1.21.1). > Then I committed some local modifications to the code. The local repo is > now ahead of e.g. 1 commit of origin. > Minor version upgrades (1.21.2) can be merged without any trouble. > > My question is now, how an major upgrade (1.21 to 1.22) preserving my > local commits can be accomplished using GIT. > The only way I found so far was using cherry-pick to transfer the local > commits to the new branch. > > Any ideas? > > The MW guide recommends to make a fresh clone and copy the config file, > images... > http://www.mediawiki.org/wiki/Manual:Upgrading#Using_Git > > Thank you, > Christoph > > _______________________________________________ > MediaWiki-l mailing list > [email protected] > https://lists.wikimedia.org/mailman/listinfo/mediawiki-l > _______________________________________________ MediaWiki-l mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-l
