[Top][All Lists]

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

Repeated Conflicts

From: Jeraimee Hughes
Subject: Repeated Conflicts
Date: Thu, 19 Feb 2004 15:54:25 -0500
User-agent: Mutt/

We now have developers working in multiple branches.

When ready I merged their branches into a release branch.

When merging I'm finding myself fixing the same conflicts over and

I have a feeling I'm missing something simple in our process. Any enlightenment?

reply via email to

[Prev in Thread] Current Thread [Next in Thread]