[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

CVS branch merge conflicts

Subject: CVS branch merge conflicts
From: Henry Story <email@hidden>
Date: Thu, 23 Jun 2005 12:36:51 +0200
Delivered-to: email@hidden
Delivered-to: email@hidden

Hi, I am looking for a tool to make it pleasant to resolve merge conflicts between a branch and the HEAD of a cvs repository. This aspect of IntelliJ is broken. Anyone know a good tool that one could use for this?

Henry Story
_______________________________________________
Do not post admin requests to the list. They will be ignored.
Java-dev mailing list      (email@hidden)
Help/Unsubscribe/Update your Subscription:
http://lists.apple.com/mailman/options/java-dev/email@hidden

This email sent to email@hidden

Follow-Ups:
- Re: CVS branch merge conflicts
  - From: Victor Langelo <email@hidden>
- Re: CVS branch merge conflicts
  - From: René Jansen <email@hidden>

Prev by Date: Re: Apple's cool-looking Search Box (Quaqua, maybe?)
Next by Date: Re: Meta mouse-click revisited...
Previous by thread: Re: How do you find supported audio formats for the mic?
Next by thread: Re: CVS branch merge conflicts
Index(es):
- Date
- Thread

Home