Say you and your friend both checked out a file, and made some changes to it. You removed a line at the beginning, and your friend added a line at the end. Then he committed his file, and you need to merge his changes into your copy. If you were doing a two-way merge (in … Read more
I would rather go with the clearfsimport script, better equipped to import multiple times the same set of files, and automatically: add new files, make new version of existing files previously imported (but modified in the source set of files re-imported) remove files already imported but no longer present in the source set of files. … Read more
In general term, the main purpose of branching (a VCS – Version Control System – feature) is to achieve code isolation. You have at least one branch, which can be enough for sequential development, and is used for many tasks being recording (committed) on that same unique branch. But that model shows quickly its limit: … Read more