To get your contents I did a 'pull --rebase ... ...' git didn't complain
but maybe it has an issue with the case of file names.
I will try a reset and see what format that pulls.
Regards,
Darran Lofthouse.
On 02/10/2011 02:31 PM, Brian Stansberry wrote:
That's very odd. The class name and file name are consistent
here. There
was an old file JmxExtension that was deleted and a file NewJMXExtension
was renamed to JMXExtension. The contents of the 2 files were different.
Git shouldn't have any issue understanding that.
On 2/10/11 6:12 AM, Darran Lofthouse wrote:
> Just updated to this branch myself and needed one change for compilation
> to work: -
>
>
https://github.com/darranl/jboss-as/tree/detyped/jmx-compilation
>
> Regards,
> Darran Lofthouse.
>
>
> On 02/10/2011 08:18 AM, Brian Stansberry wrote:
>> The detyped2 branch[1] is now ready to be pushed into upstream; the old
>> typed stuff is gone and the detyped versions have been renamed from New*
>> to *. If anyone can have a look before I get up in the morning, I'd
>> appreciate it. I'll push it then.
>>
>> [1]
https://github.com/bstansberry/jboss-as/tree/detyped2/
>>
>> On 2/8/11 4:52 PM, Brian Stansberry wrote:
>>> I've started the process of merging the detyped2 branch[1] into master.
>>> Until that's complete, no other patches will be merged into master. My
>>> hope is it will be done late tomorrow US time, perhaps early Thursday.
>>>
>>> []
https://github.com/bstansberry/jboss-as/tree/detyped2
>>>
>>
>>
>