Hi all.
http://twitpic.com/5ctrar/full
There are a picture of my issue!!!
On Fri, Jun 17, 2011 at 2:32 AM, Stefan Sperling wrote:
> On Thu, Jun 16, 2011 at 10:21:49PM -0500, Henry Piñeros wrote:
> > 7. Again, I do a checkout from trunk (C:/Trunk).
> >
> > 8. svn merge
images)
Thank before hands
... I forget this!! I do merge between the files .java with tortoise which
work very well.. It show the copnflict
2011/6/16 Michael Diers
> On 2011-06-16 22:37, Henry Piñeros wrote:
> > Can you try it in your computer ? A simple example!!! ( a flder wit
Can you try it in your computer ? A simple example!!! ( a flder with two
files)
On Thu, Jun 16, 2011 at 3:36 PM, Henry Piñeros wrote:
> Thanks Stefan!!.
>
>
> Yes, I do svn revert -R or do a new checkout!!!
>
> The problem is whenI try do a mergen on file level, but if I
2PM -0500, Henry Piñeros wrote:
> > Hi all.
> >
> >
> > I do a merge between two folders (source) (Ep. svn merge
> > http:xxx/src http:xxx/src) and it works very well (It shows a File1.java
> > with a conflcit -C)
> >
> > Whe and I try do it but d
Hi all.
I do a merge between two folders (source) (Ep. svn merge
http:xxx/src http:xxx/src) and it works very well (It shows a File1.java
with a conflcit -C)
Whe and I try do it but directly in this file, the merges doesn't work (Ep.
svn merge http:xxx/src/File1.java http:xxx/src/File1.java )..
