Hi,
I'm trying to understand a tree conflict problem during merge. After the merge
from an import branch to trunk the client states
"Tree conflict on 'upload.bat'
> local file edit, incoming file delete upon merge"
Normally I understand tree conflicts and generally know how to solve them. But
We have some generated files that, for logistical reasons, are way
easier to just check into the respository alongside the source than to
build on-demand. (They're small text files, not some big binary or
something like that.)
Is there a way to instruct Subversion to remove write access when
check
On 16.07.2015 02:41, Evan Driscoll wrote:
> We have some generated files that, for logistical reasons, are way
> easier to just check into the respository alongside the source than to
> build on-demand. (They're small text files, not some big binary or
> something like that.)
>
> Is there a way to
> -Original Message-
> From: Branko Čibej [mailto:br...@wandisco.com]
> Sent: Thursday, 16 July 2015 10:53 AM
> To: users@subversion.apache.org
> Subject: Re: Something like svn:executable for the read-only bit?
>
> On 16.07.2015 02:41, Evan Driscoll wrote:
> > We have some generated file
