Subject: Re: [boost] [git] [conversion] Schedule and remaining showstoppers?
From: Jonathan Wakely (jwakely.boost_at_[hidden])
Date: 2013-10-16 12:03:46
On 16 October 2013 15:18, Beman Dawes wrote:
> Like all merges, start by switching to the branch to be merged to -
> "master" in this case. Then merge from the whole "develop" branch if 85994
> is the only difference. Otherwise, you need to merge just the 85994
> changeset. (I'm a TortoiseGit user, so am the wrong person to ask about how
> to do that from the command line. But "git help merge" from the command
> line may well tell you enough to figure it out.)
I assume 85994 is an svn revision, so to git merge it you need to know
the Git SHA1 commit ID for that commit. You can find that via "git
log" and looking for the relevant commit message, but you can't just
merge 85994 without some extra work.