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 mergi
Tristan Juricek writes:
> I'm getting a merge conflict when merging files that only have lines
> deleted from the branch to the main repository.
>
> Essentially what's happening is that we have a build system here that
> automatically creates user branches for doing work. One of the users
> mad
Jacob Burckhardt writes:
> Tristan Juricek writes:
> > I'm getting a merge conflict when merging files that only have lines
> > deleted from the branch to the main repository.
...
> >
> > I'm wondering if anyone else has seen this behavior.
>
>
[EMAIL PROTECTED] writes:
> I would appreciate help understanding how the merge conflict
> that I am about to describe can logically happen. (I am
> using cvs 1.11).
...
> I got a
> merge conflict on a file that had never been modified on
> SUB_BRANCH. I checked the history of the file on BRAN
Thomas Soumarmon writes:
>
> Juanjo,
>
> when you add a file directly into a branch it is not added into the main
> trunk. In the main trunk it appears like a deleted file (in the attic).
>
> When you merge your branch to the main trunk you have to add those files.
Adding at that point is unne
[EMAIL PROTECTED] writes:
>
> We are using CVS version 1.10 running on Solaris 2.8.
> A 'problem' occured when CVS merged a file multiple users had checked out and
> altered.
...
> Please help. Our understanding of CVS's merge function should have caught these
> differences. Is our understandin
[EMAIL PROTECTED] writes:
> Problem:
>
> A file from the trunk had lines of code removed.
>
> After doing the sync, I had expected to see the lines of code move in the
> target file but they stayed put.
>
> Based upon my simple understanding of how the merge works can anyone
> explain what may
Larry Jones writes:
> Dave Thorn writes:
> >
> > However, several times recently I have found code to mysteriously
> > stop working (investigation suggests this is after someone else
> > commits changes to the file), not through compile errors, but logic,
> > and when I look, the changes I made r
John Klassa writes:
>
> ...
>
> Oddly, I had one file with several conflicts in it, some
> large. This made absolutely no sense to me. The trunk and the dev
> branch are identical right after a merge, and the dev branch only has so
> much done to it before I go ahead and merge down to the trunk,
10 matches
Mail list logo
