On Thu, Jan 8, 2009 at 12:49 PM, "Peter Valdemar Mørch (Lists)" wrote: > > However *the* problem was with repeated merges: I later discovered a problem > on the branch and need to add a commit for it to both master and > newbranch/gitnewbranch. Aside from git cherry-pick (where I take care of the > repeated merge problem) I still haven't found a good solution. Well, the real problem is that it *isn't* a repeated merge. Subversion rebased your trunk on you, so you... > I ended up using git cherry-pick, and diff and patch / git diff and git > apply. ...wind up needing to do this. Don't rebase trunk (which implies ditching subversion, (un)fortunately), and repeated merges should Just Work. See, for example, the git repository itself, where the master branch is repeatedly merged into next. Peter Harris -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
