On 10/2/07, Carl Worth <cworth@xxxxxxxxxx> wrote: > What I think I've always wanted is something like the following > behavior for "git pull": > > * Fast forward if possible > > * Otherwise, rebase, but only if there are no conflicts at all > > * Otherwise, do the merge as normal, (leave conflict markers in > place allowing the user to fix them up and then commit). > > Would it be straightforward to turn your rebase merge strategy into > something like the above? And if so, would that address the primary > concerns that Junio raised? Maybe we need a 'pull' strategy' - merge, rebase or <insert name for strategy you describe above>. -Tom - 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
