On Thu, Nov 11, 2010 at 04:25, Dennis <denny@xxxxxxxxxxxxxxxxxx> wrote: > I have started a web project (call it branch1), and have maintained it > without a version control system for quite some time. > Then, I copied it to another folder (branch2) and while the project remained > essentially the same, I have changed a few of internal paths and some > variable names inside the files. > Then, a few months later on, I copied branch2 to a folder called branch3 and > also modified some of the variable names and some of the internal structure > of the files. > > Thus I ended up with 3 folders on my local HDD with pretty much the same > file names and folder structure and everything, and most of the file > content, except those small deltas that made those files different for each > branch. > > I guess it's never too late, and now I want to put these 3 projects into a > version control system, and I chose git. > > Now, this can be either really simple or really complicated. ÂMy first > question is: Âhow do I set the repository up in the proper way where I could > work on all 3 projects separately, with additional possibility of working on > branch1 only and later committing my changes to branch2 and branch3. Â(Since > projects are virtually identical, a fix in one branch usually needs to be > propagated to other branches) > First, I assume I will use a single repository for this. ÂThen, do I simply > set up 3 branches and start using them, or is there a way to set git up to > capitalize on the projects being nearly identical? Assuming I've got the relationships of your "branches" right: $ cp -a branch1 branch && cd branch $ git init $ echo /huge-images/ >.gitignore $ git add .gitignore; git add .; git commit; git branch branch1 $ git checkout -b branch2 $ cp -a ../branch2 . $ git add .; git commit $ git checkout -b branch3 $ cp -a ../branch3 . $ git add .; git commit > My second question is that each branch has a huge folder with image data. By > huge I mean 1 to 4Gb, depending on the branch. ÂSince images are not > directly relevant to the development work, is there a way to not include > those folders in git? ÂTo be honest though, I probably should include them, > but I wanted to ask about this separately as git repository may be get > large, since all 3 branches may grow to 9Gb or so. > > Thus I am looking for a git way to handle my situation. ÂIs this simple or > is is hard? If you add the images you will eventually run into problems (heavy swapping, for one). Git is not really setup to work with big binary files (a file must fit into memory completely). -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html