Redmine

Whoops... Seems there is a 1.1 branch.. Just appeared! (at least it just appeared in my local repo which I did `git fetch`...)

And it seems there's no easy merge between 1.0-stable and 1.1-stable. Here's what I did:

# get the 1.1-stable branch
git checkout origin/1.1-stable
# create a temporary branch to hold the merge
git branch merger
git checkout merger
# merge from 1.0 to 1.1, keeping everything in 1.1
git merge -s ours origin/1.0-stable
# now git knows how to get from 1.0 to 1.1, let's 
# apply that to our live_site branch
git checkout live_site
git merge merger
# done, delete the merger branch
git branch -d merger
# don't forget to restart ruby
touch tmp/restart.txt

Hope that helps someone.

Matt Connolly wrote:

And it seems there's no easy merge between 1.0-stable and 1.1-stable.

Not per se, because the git repo is a mirror of the svn repo, which uses "svn techniques" that don't always translate well or easily to git.