• Anonymous
  • Login
  • Register



Source Control Enablement for Designer - Discussion: Conflicts in .metadata file when 2 people edit the same element

Created on Apr 13, 2011
Created by Mark Leusink
Status
Open

Hi,

We're just starting to use the SVN plugin for the Bildr project (also available on this site Glimlach ). Since I had some (versioning) problems installing it, I wrote a blog post about how to install the correct versions (see here).

Nick Wall posted a comment on my blog about an interesting issue:

"The main problem is that if you and Patrick edit the same element and push that to svn, no problem for svn or the plugin to get the data into Notes.nsf, but, every time you save a Notes design element, it saves "meta" data (time saved etc.). Now every single time you and other collaborators have worked on the same design elements, you will always get conflicts in SVN...which SVN allows you to merge, but this becomes tiresome very quickly. You can get SVN to ignore various files, e.g. Database props change all the time, but I do not know of anyway to ignore a section of the file."

Any thoughts about this?

Mark




Documents
     
Creation Date
Author
Subject
Apr 13, 2011 Mark Leusink Conflicts in .metadata file when 2 people edit the same element
Apr 13, 2011 Maureen Leland     Response: resolved in the product version
     
In this field you can enter the actual discussion topic.

You can use the rich text editor for rich text formating. You can also enter HTML to embed objects, e.g. to embed a YouTube video or a screenshot of the project. In this case use '[' and ']' to mark the passthrough HTML as such.

Please note that the first time you use the new UI your description is converted from rich text to MIME. You might want to copy and paste the raw plain text from the old UI in the new UI so that you don't loose information.