<?xml version="1.0" encoding="UTF-8"?>
<rss xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:taxo="http://purl.org/rss/1.0/modules/taxonomy/" version="2.0">
  <channel>
    <title>topic SVN - Merging pre-SVN files to repository in QlikView</title>
    <link>https://community.qlik.com/t5/QlikView/SVN-Merging-pre-SVN-files-to-repository/m-p/359116#M133292</link>
    <description>&lt;HTML&gt;&lt;HEAD&gt;&lt;/HEAD&gt;&lt;BODY&gt;&lt;P&gt;Hi,&lt;/P&gt;&lt;P&gt;&lt;/P&gt;&lt;P&gt;I finally got SVN working, but I have changes in 2nd QVW that I want to merge with what's in the repository. I tried manually copying the files from the 2nd -prj directory directly to the SVN controlled -prj directory, but I can't get it to merge. &lt;/P&gt;&lt;P&gt;&lt;/P&gt;&lt;P&gt;If I update with Tortoise, the old files I copied are overwritten with what's in the repository. If I select commit, I get a message saying that there's nothing to commit.&lt;/P&gt;&lt;P&gt;&lt;/P&gt;&lt;P&gt;Any suggestions to get this done?&lt;/P&gt;&lt;/BODY&gt;&lt;/HTML&gt;</description>
    <pubDate>Thu, 19 Jul 2012 16:45:26 GMT</pubDate>
    <dc:creator />
    <dc:date>2012-07-19T16:45:26Z</dc:date>
    <item>
      <title>SVN - Merging pre-SVN files to repository</title>
      <link>https://community.qlik.com/t5/QlikView/SVN-Merging-pre-SVN-files-to-repository/m-p/359116#M133292</link>
      <description>&lt;HTML&gt;&lt;HEAD&gt;&lt;/HEAD&gt;&lt;BODY&gt;&lt;P&gt;Hi,&lt;/P&gt;&lt;P&gt;&lt;/P&gt;&lt;P&gt;I finally got SVN working, but I have changes in 2nd QVW that I want to merge with what's in the repository. I tried manually copying the files from the 2nd -prj directory directly to the SVN controlled -prj directory, but I can't get it to merge. &lt;/P&gt;&lt;P&gt;&lt;/P&gt;&lt;P&gt;If I update with Tortoise, the old files I copied are overwritten with what's in the repository. If I select commit, I get a message saying that there's nothing to commit.&lt;/P&gt;&lt;P&gt;&lt;/P&gt;&lt;P&gt;Any suggestions to get this done?&lt;/P&gt;&lt;/BODY&gt;&lt;/HTML&gt;</description>
      <pubDate>Thu, 19 Jul 2012 16:45:26 GMT</pubDate>
      <guid>https://community.qlik.com/t5/QlikView/SVN-Merging-pre-SVN-files-to-repository/m-p/359116#M133292</guid>
      <dc:creator />
      <dc:date>2012-07-19T16:45:26Z</dc:date>
    </item>
  </channel>
</rss>

