[vtk-developers] git stupid question #4

Brad King brad.king at kitware.com
Fri Apr 30 10:51:29 EDT 2010

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.


More information about the vtk-developers mailing list