ZTree.com  | ZEN  | About...  

 Index   Back

[Help!] Merge Two Branches Where One is a Sub-branch   [Help!]

By: Peter Shute       
Date: May 10,2016 at 04:01
In Response to: [Help!] Merge Two Branches Where One is a Sub-branch (John Baum)

> The included screen-shot shows a directory with a path that reads:
>
> Autosketch>ASketchDrawings>2010Remodel
>
> and a short way down in it is another path that reads
>
> Autosketch>ASketchDrawings>ASketchDrawings>Addn09>2010Remodel

How can the directory "Autosketch" contain two folders both called "ASketchDrawings"? I'd be wary of touching anything till I'd worked that out. It might be that one of them has a space at the end of the name, or something like that.

> The branch is duplicated, but a branch name, "Addn09", is
> interpolated.
>
> I would like to merge the two "2010Remodel" branches so that the end
> result eliminates the 'extra' branch and the primary branch contains
> any more recently added or edited files, each in its proper branch
> folder.
>
> Is there an efficient way to do this with ZTree, or do I need to
> compare each branch, select and delete the extra copy of the files, and
> then delete the branch folder until I get back to the unwanted branch
> folder?

Given the small number of folders involved, I'd be doing this a subfolder at a time, in case I get confused. I would use split screen mode to get the two branches side by side, and use Alt+compare to tag newer and unique files to copy.

If there are sub-sub-folders involved, I'm not sure how I'd do it. I think I'd duplicate the main branch somewhere, and do a practice run somewhere else with Alt+copy. It would be easy to mess up the paths and make it worse, or overwrite something.

937 views      
Thread locked
 

Messages in this Thread

 
96,637 Postings in 12,231 Threads, 350 registered users, 82 users online (1 registered, 81 guests)
Index | Admin contact |   Forum Time: Mar 28, 2024 - 11:52 pm UTC  |  Hits:62,384,972  (37,369 Today )
RSS Feed