{"thread":{"id":"24318","subject":"Question concerning svn -> git migration, merging","startedAt":"2010-07-07T12:29:20Z","lastAt":"2010-07-07T12:29:20Z","messageCount":1,"participants":["Péter András Felvégi"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"145018","messageId":"AANLkTimBNgyUpBbaIRCyDKsXsvsqEu3SWUVTqT7un1W5@mail.gmail.com","threadId":"24318","inReplyTo":null,"subject":"Question concerning svn -> git migration, merging","fromName":"Péter András Felvégi","fromEmail":"petschy@gmail.com","sentAt":"2010-07-07T12:29:20Z","receivedAt":"2010-07-07T12:29:20Z","isPatch":false,"sender":{"key":"petschy@gmail.com","avatar":null},"body":"Hello,\n\nI was happy with svn for a while, but recently I started a new branch\nwhere I moved/renamed a few files, and merging became a less pleasant\nexperience: I have to manually generate diffs from the trunk and patch\nthe moved files on the branch (apart from remembering which revisions\nwere already merged).\n\nI cloned the svn repo, checked out the branch, but when I try to merge\nfrom master, I got a lot of conflicts. I guess this is because I did a\nfew merges already in svn (before the repo cloning), but git is not\naware of that. How could I merge the changes on trunk starting from a\nspecified revision number, so that only new stuff gets merged? If that\ncould be done, I would be happy with git-svn (future merges should be\neasy), and never look back.\n\nPlease CC me in your reply, I'm not subscribed to the list.\n\nThanks, Peter\n"}]}