[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
RE: Cannot commit after mergeing a branch to main
|
From: |
Jim.Hyslop |
|
Subject: |
RE: Cannot commit after mergeing a branch to main |
|
Date: |
Fri, 20 Aug 2004 09:08:27 -0400 |
Rohan Nandode wrote:
> As the commit error message and status command suggests, when
> you merged
> file into the trunk, it resulted into some conflicts. You need to
> resolve those before you commit.
"Up-to-date check failed" could also mean that someone else checked in a
change after the merge. Another update might clear the problem.
--
Jim Hyslop
Senior Software Designer
Leitch Technology International Inc. (http://www.leitch.com)
Columnist, C/C++ Users Journal (http://www.cuj.com/experts)