Paul, are you referring to the file /Resources/Resource.designer.cs ?
This file should not be in source control (AFAIK), as resource ids are regenerated on any build and aren't guaranteed to be the same. That's also the _reason_ it doesn't need to be in source-control... it is generated every compile. If you want to do further reading, it's equivalent to the R.java file in regular Android. I presume that your app still works as expected ~ it's just the file diff that has concerned you? cd On Mon, Sep 17, 2012 at 7:31 PM, Paul Johnson <p...@all-the-johnsons.co.uk>wrote: > Hi, > > Is anyone else seeing this problem (it's on bugzilla > https://bugzilla.xamarin.com/**show_bug.cgi?id=7163<https://bugzilla.xamarin.com/show_bug.cgi?id=7163> > ) > > Basically, create on VS2010, commit to svn (not tried with cvs or git), > edit using MD, recommit and open again on VS, change something, build. The > next commit there is a conflict in the resources with all resource IDs > being out by 1. > > Anyone else seeing this or something similar? I'm using VS2010, MD 3.0.4.6 > (I think it is on the mac) and M4A 4.2.5 (release) on both. > > Paul > -- > "Space," it says, "is big. Really big. You just won't believe how vastly, > hugely, mindbogglingly big it is. I mean, you may think it's a long way > down the road to the chemist's, but that's just peanuts to space, listen..." > Hitch Hikers Guide to the Galaxy, a truely remarkable book! > ______________________________**_________________ > Monodroid mailing list > Monodroid@lists.ximian.com > > UNSUBSCRIBE INFORMATION: > http://lists.ximian.com/**mailman/listinfo/monodroid<http://lists.ximian.com/mailman/listinfo/monodroid> >
_______________________________________________ Monodroid mailing list Monodroid@lists.ximian.com UNSUBSCRIBE INFORMATION: http://lists.ximian.com/mailman/listinfo/monodroid
