Comments on: git by example – upgrade wordpress like a ninja

By: Golgo Com Plexsho

Golgo Com Plexsho — Mon, 18 Oct 2010 21:17:38 +0000

haha, that is the best tutorial for beginners, that´s what I was thinking. Finally git made easy. BUT then the comment by Sharpy – and suddenly, after reading all the page, everything breaks together to pieces. I hate this complexity of git. Everybody seems to use it in a different way and nobody really seems to really understand, what happens…
if you have the same feeling: I feel that mercurial is much more easy to work with, there is one way to do it and not one million different ways.

By: numerodix

numerodix — Fri, 11 Dec 2009 15:53:13 +0000

Perhaps you’re right, maybe I should have done that.

By: Adam Sharp

Adam Sharp — Wed, 09 Dec 2009 23:25:34 +0000

Is there a particular reason that you chose rebasing over merging? From what I’ve read so far (I’ve been using git for a little while now) it would achieve the same thing and give you a more accurate history to do the following when upgrading:

- Make changes on the ‘mine’ branch
- Checkout ‘master’ and perform the WP upgrade
- Checkout ‘mine’ once more
- Merger ‘master’ into ‘mine’
- Resolve merge conflicts if necessary

This still leaves ‘master’ intact, only containing the upstream WP code, but gives all the benefit of the upgrade on the ‘mine’ branch. Also because you have preserved your commit history rather than rebasing, you can still revert to the state prior to the merge with no worries.

What do you think?

—Sharpy

By: Mark Robinson

Mark Robinson — Sun, 12 Apr 2009 19:26:41 +0000

Hi, I’ve been trying to work this out on my own for ages – thanks so much for documenting it in a simple to understand way.

By: Praveen

Praveen — Sun, 12 Oct 2008 20:03:47 +0000

Hey, Thanks a lot for the detailed writeup. really appreciate the effort.
The post is very simple, self explanatory, to the point and covers all sections.

Cheers! Keep up the great work.

By: Git by Example - Upgrade Wordpress Like a Ninja | WebLaunches

Git by Example - Upgrade Wordpress Like a Ninja | WebLaunches — Mon, 22 Sep 2008 19:46:48 +0000

[...] In fact, with git you can keep track of what changes you have made and have access to them…read more | digg [...]