epeleg Posted November 21, 2011 Report Share Posted November 21, 2011 Are there any recommendations as to how to work with excel files and plasticscm ? I use an excel file to keep strings for i18n, now suppose I need to change it in some branch/task, how do I handle merges? There is a good post about using beyond compare for doing diff for excel files here: http://codicesoftware.blogspot.com/2011/05/setting-up-plastic-scm-with-external.html but no reference to merging. Thanks, Eyal Link to comment Share on other sites More sharing options...
deanaug Posted November 22, 2011 Report Share Posted November 22, 2011 Haven't tried Plastic 4.0 yet (waiting til side-by-side operation with 3.0 is "stable" for that), but with 3.0 there is no attempt to merge the contents of binary files like Excel, Word, etc. Instead, if a three-way merge is needed, Plastic prompts you to pick which file is the "latest and greatest", and takes the entire contents of the one you picked, so it becomes a copy operation rather than a merge. Plastic allows (or at least did in 3.0) you to specify your own external diff/merge tool to work with binaries, rather than their built-in support, if you have one on hand. Note that sub-branches for binaries work OK as long as you only make changes to the binary on the CHILD branch. If you make parallel changes on both parent and child branches, you'll probably be forced to fix the conflicts manually (usually involves arm wrestling for who is going to save-as and un-checkout their file, then redo the changes once the other person has checked in their changes). Link to comment Share on other sites More sharing options...
psantosl Posted November 22, 2011 Report Share Posted November 22, 2011 You can set up your own excel merge tool. There are some out there... Link to comment Share on other sites More sharing options...
epeleg Posted November 23, 2011 Author Report Share Posted November 23, 2011 psantosl - can you recommend any such tool? Link to comment Share on other sites More sharing options...
psantosl Posted November 23, 2011 Report Share Posted November 23, 2011 Look, this one can diff http://www.workshare.com/go/compare-excel-workbooks.aspx?_kk=excel%20compare&_kt=11a8a57d-395f-4de6-a5a8-68d8d8cda813&gclid=CN_q-KDazKwCFQ0OfAodvWT1TQ http://www.exceldiff.com/ And here you'll find something able to merge (converting to txt first) http://freemind.s57.xrea.com/xdocdiff/e/index.html And the great BeyondCompare does it too: http://www.scootersoftware.com/moreinfo.php?zz=screenshot&shot=DataCompare Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.