On Sat, Feb 09, 2008 at 11:23:30AM +1300, Martin Langhoff wrote: > On Feb 9, 2008 12:52 AM, Johannes Schindelin <Johannes.Schindelin@xxxxxx> wrote: > > That question comes up pretty often, I think. But you need a working > > directory to resolve conflicts for merges. You only have one, though. > > Once all the remote refs are fetched, it is trivial to determine that > it is just a fast-forward, therefore _no_ merge and no chance for > conflicts... Even with merges, it could be helpful to have a tool that would automagically stash, checkout the appropriate branch, merge (and deal with conflicts if necessary), and so on. Mike - 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
