[vtk-developers] git stupid question #4

[Biddiscombe, John A.]

Brad

> Perhaps these are real conflicts that you would have gotten with a
> "cvs update" previously.  We did recently do a sweeping change to
> get rid of vtkTypeRevisionMacro and vtkCxxRevisionMacro.

OK. You're right. I tried checking out the branch and doing it the slow way and I get the same conflicts. I fixed all these conflicts when I merged yesterday. I remember Stephane mentioning some rerere which I'll look into, but I don't understand why I need to redo these conflicts. Am I going to have to redo them every single time I merge. This is crazy. 
Will rebasing solve it for me? (I guess this will move the diff point past where these conflicts keep occurring)

JB