On 12/24/2013 03:19 PM, Joaquin M Lopez Munoz wrote:
Daniel James
writes: On 24 December 2013 13:03, Joaquin M Lopez Munoz
wrote: even though branch develop is indeed different from (and more recent than) the code in master (it contains changes from about one month or so intended for Boost 1.56 that weren't published when the branch master was originally created)
How did you merge? I tried checking out the old version and merging, and got a lot of merge conflicts (I think you got your merge point a little wrong, but that isn't a big problem). Did that happen for you?
At some point that happened to me, I seem to remember I reverted or something and then retried. Not completely sure, though, now the situation is as I describe, git merge --no-ff develop tells me I'm up-to-date even though branches are different.
Or maybe you used "git merge -s ours"? The "-s ours" flag on the wiki was just for creating the merge point, as it tells git to use the "ours" merge strategy, which basically performs no merge at all (roughly similar to using 'svn merge --record-only' in subversion). The text on the wiki should be clearer here.
I did -s ours as explained in "First post-svn conversion merge to master", and this seems to have gone well (commit meddage "created first merge point for Git".) It is on the second commit that I messed things up, seemingly (commit message "Merge branch 'develop'"), and to be honest I don't remember if I used -s ours (I understand I mustn't use it, but I did something wrong, maybe it was that.)
That concur with what I see as well. It looks like your 3239677c40b6e15d1bb49675cabb077460333538 merge is not merging the develop change sets into master at all, but the other way around. I recommend "gitk --all", then select View --> Edit View, then select the "Strictly sort by date" for getting a better understanding of what is going on. To compare commits, e.g. parents in a merge with the merge, simply select one, then right click the other for the diff options.
Do you want to have master identical to develop?
Yes, I want the master branch to be exactly the same aas the branch develop stands now.
Then just try it again. git checkout master git tag bad-merge # for the paranoid needing an easy way to get back! git reset --hard 3239677c40b6e15d1bb49675cabb077460333538 git merge --no-ff develop ... check you got what you want git tag -d bad-merge # for the paranoid that now has calmed down -- Bjørn