Issue 6990 in pharo: When merging, class categories are always shown as conflict

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

Issue 6990 in pharo: When merging, class categories are always shown as conflict

pharo
Status: Accepted
Owner: [hidden email]
CC: [hidden email]
Labels: Type-Bug Milestone-2.0 Importance-High

New issue 6990 by [hidden email]: When merging, class categories are  
always shown as conflict
http://code.google.com/p/pharo/issues/detail?id=6990

see attachment

Attachments:
        Merging  
SLICE-Issue-6894-Add-Error-toleran-parsing-to-RB-CamilloBruni.2.jpeg  56.6  
KB


_______________________________________________
Pharo-bugtracker mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-bugtracker
Reply | Threaded
Open this post in threaded view
|

Re: Issue 6990 in pharo: When merging, class categories are always shown as conflict

pharo

Comment #1 on issue 6990 by [hidden email]: When merging, class  
categories are always shown as conflict
http://code.google.com/p/pharo/issues/detail?id=6990

I already uploaded a fix... it didn't worked?


_______________________________________________
Pharo-bugtracker mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-bugtracker
Reply | Threaded
Open this post in threaded view
|

Re: Issue 6990 in pharo: When merging, class categories are always shown as conflict

pharo

Comment #2 on issue 6990 by [hidden email]: When merging, class  
categories are always shown as conflict
http://code.google.com/p/pharo/issues/detail?id=6990

Nope... now it is always conflicting, yet there is no conclict. (they are  
the same)


_______________________________________________
Pharo-bugtracker mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-bugtracker
Reply | Threaded
Open this post in threaded view
|

Re: Issue 6990 in pharo: When merging, class categories are always shown as conflict

pharo

Comment #3 on issue 6990 by [hidden email]: When merging, class  
categories are always shown as conflict
http://code.google.com/p/pharo/issues/detail?id=6990

Issue 7035 has been merged into this issue.


_______________________________________________
Pharo-bugtracker mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-bugtracker
Reply | Threaded
Open this post in threaded view
|

Re: Issue 6990 in pharo: When merging, class categories are always shown as conflict

pharo
Updates:
        Status: Duplicate
        Mergedinto: 7191

Comment #4 on issue 6990 by [hidden email]: When merging, class  
categories are always shown as conflict
http://code.google.com/p/pharo/issues/detail?id=6990

(No comment was entered for this change.)


_______________________________________________
Pharo-bugtracker mailing list
[hidden email]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-bugtracker