search

bnmurphy / PMCAMx-2008

This Repository is for testing version control between SU, Patras, and CMU
Other
3 stars 1 forks source link

importing disconnected history to git #14

Closed sebarn closed 10 years ago

sebarn commented 10 years ago

check out pp.154 in the Git pocket guide. I think this is extremely relevant to this project.

bnmurphy commented 10 years ago

Yeah, read through most of the book this weekend. Getting the general idea a little better but practice is still going to make perfect. I think for our purpose, the instructions in that section don't quite line up. It assumes you have disconnected histories rather than just random versions.

So, we could: 1) build an actual history among the other versions we have and then merge it in using that strategy, or, 2) just branch off many times, incorporate each version in question into that branch, and then merge back, noting any changes that we want to keep for sure.

Number 2 seems more intuitive to me.

sebarn commented 10 years ago

ok, just wanted to bring it up ;-)