Hi all. I am a git newby, sorry if the question is dumb but i didn't find an answer yet.
I did the following bad thing: 1) Made a repo, with HEAD node that we call "H". H contains a lot of new code respect with its parent node. 2) Checked out an earlier version, that we call "OLD". 3) Then I forgot about point 2 for a couple of days. 4) Changed a few lines in "OLD" and commited. Let's call this commit "H_OLD". It's not a serious issue in practice (no heavy editing), but I couldn't find a good method to reconcile H_OLD with H other than checking out the two versions and use an external interactive tool. If I try a git-merge between H_OLD and H, the stuff that I added in H is considered deleted in H_OLD and is removed from the merged revision, which is the way git is supposed to behave in a normal situation. But what about my special case? Thank you in advance for any help. -- To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected]
