Page History

...

Export the current live OFBiz as per stage 3 above, updating the revision number as appropriate, so in this example I end up with ofbiz_apache_r483333_export\ofbiz_apache_current.

3. OFBiz Merge

Wiki MarkupNow I'm going to merge the exported folder into *ofbiz_local_current* using WinMerge. I tend to merge left to right so do:  
  Left: ofbiz_apache_r483333_export\ofbiz_apache_current\  
  Right: ofbiz_local_current\  
  Filter: \ [F\] Java CVS/SVN loose  _loose  (just want it to skip the .svn folders)_

How to merge:  (helps to hide skipped and identical files)
1) Sort by Comparison results
2) Transfer all files listed as "Files are different" and "Binary files are different", left to right.
3) Now sort by Filename and you should have all the folders at the top and you can see what might have been added, moved or deleted:
  Added: This is a simple copy left to right in WinMerge

...