Little tangent here, but FWIW I found that the version on the server
supported merge tracking so it was super wierd that the whole codebase
reported tree conflicts. I think we merged incorrectly a long time ago and
this might have caused the conflicts. I just rebranched, problem solved,
next step
Correction: r7 through r2194
On Thu, Dec 8, 2011 at 10:15 AM, Randall Reynolds <
randallmreyno...@gmail.com> wrote:
> When I select merge a range of revisions and leave the range blank, it
> says:
>
> Merging r7 through 42194
> <~10 tree conflicts on main folders>
issue?
Thanks,
Randall
On Thu, Dec 8, 2011 at 8:36 AM, Randall Reynolds wrote:
> Thanks, Mark!
>
>
> On Thu, Dec 8, 2011 at 8:29 AM, Cooke, Mark wrote:
>
>> > On Thu, Dec 8, 2011 at 4:05 AM, Stefan Sperling wrote:
>> >
>> > > > On Wed, Dec 07, 201
Thanks, Mark!
On Thu, Dec 8, 2011 at 8:29 AM, Cooke, Mark wrote:
> > On Thu, Dec 8, 2011 at 4:05 AM, Stefan Sperling wrote:
> >
> > > > On Wed, Dec 07, 2011 at 04:23:09PM -0700, Randall
> > > > Reynolds wrote:
> > > > Hi,
> > > >
the tortoise log? Ex. Should I leave the revision range
blank in the future?
Thanks,
Randall
On Thu, Dec 8, 2011 at 4:05 AM, Stefan Sperling wrote:
> On Wed, Dec 07, 2011 at 04:23:09PM -0700, Randall Reynolds wrote:
> > Hi,
> >
> > I created a trunk and branch A from the
Hi,
I created a trunk and branch A from the trunk. Then, I created a file in
the trunk. Then, I merged from the trunk to the branch using TortoiseSVN's
merge two branches option. The merge encountered a tree conflict on the
file. Selecting edit tree conflict says:
The last merge operation
> Hi,
>
> I created a trunk and branch A from the trunk. Then, I created a file in
> the trunk. Then, I merged from the trunk to the branch using TortoiseSVN's
> merge two branches option. The merge encountered a tree conflict on the
> file. Selecting edit tree conflict says:
> The last mer
