Hi,
I have encountered merge conflicts that are very strange to me:
At some point during the development of a project, we created a branch from
the main trunk. A lot of work was done in that branch, but ever since the
branch was created, NO work was done on main trunk. That is, the latest
version
Reinstein, Shlomo writes:
> Hi,
>
> I have encountered merge conflicts that are very strange to me:
> At some point during the development of a project, we created a branch from
> the main trunk. A lot of work was done in that branch, but ever since the
> branch was created, NO work was done on m
Jacob Burckhardt writes:
> Reinstein, Shlomo writes:
...
> > Since no work was done on the main trunk since the creation of the branch,
> > I'd expect CVS to just update the working directory with the newest version
> > of the branch. (which would be the result of merging all changes made in the
>
