Git subtree merge

Mon, 29 Oct 2012 18:31:00 +0000

Last week I took part in an intensive Clojure-course which was an introduction to functional programming using Clojure. The course itself was fairly well organized and interesting but that’s not the topic of this post.

The course was built around solving small programming tasks using clojure. Each topic had their own separate git repository on github which we cloned and added our solutions in. The end result was that participants had many repositories (one for each exercise set) and this was fine during the course. Now that I’ve successfully passed the course I wanted to get rid of all the separate repositories and combine them to a single git repository. I could have simply created a new repository and copied the files into it but this way I would have lost all commit history. I have previously used git submodules but since I won’t be developing these assignments further I would rather not use that method. Few minutes of googling and I found a solution for my problem, git subtree merge. Subtree merge is perfect for my use case since my repositories were separate but they shared no data with each other. In other words there would not be any merge conflicts.

Git on joh.fi

Git subtree merge