Biddiscombe, John A. wrote: > I fixed all these conflicts when I merged yesterday If that merge commit is reachable from your current HEAD when you do the new merge, you shouldn't have to resolve them again. -Brad