Conflicts (2/5)

There is the old-school way, opening the file in a text editor and fixing it: <<<<<<< .mine +----------------+ | Haiku | | by Josh Glover | +----------------+ ======= Haiku by Josh Glover +-+-+-++-+-+-+ >>>>>>> .r11 CVS no good? Subversion to the rescue: Branching is easy!

There is the old-school way, opening the file in a text editor and fixing it: <<<<<<< .mine +----------------+ | Haiku | | by Josh Glover | +----------------+ ======= Haiku by Josh Glover +-+-+-++-+-+-+ >>>>>>> .r11 CVS no good? Subversion to the rescue: Branching is easy!