Issue 7191 in pharo: MC merge generate conflicts for categories

Status: Accepted
Owner: [hidden email]
Labels: Type-Bug Milestone-2.0

New issue 7191 by [hidden email]: MC merge generate conflicts for  
categories
http://code.google.com/p/pharo/issues/detail?id=7191

And this is annoying :)
And I have a fix now :)




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

Updates:
        Status: FixToInclude
        Labels: Importance-High

Comment #1 on issue 7191 by [hidden email]: MC merge generate  
conflicts for categories
http://code.google.com/p/pharo/issues/detail?id=7191

Slice in the inbox


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

Updates:
        Cc: [hidden email]

Comment #2 on issue 7191 by [hidden email]: MC merge generate  
conflicts for categories
http://code.google.com/p/pharo/issues/detail?id=7191

Issue 6990 has been merged into this issue.


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

Updates:
        Status: Integrated

Comment #3 on issue 7191 by [hidden email]: MC merge generate  
conflicts for categories
http://code.google.com/p/pharo/issues/detail?id=7191

Integrated in 20462


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