merging 3 source versioned trees into 1

Posted by user309779 on Stack Overflow See other posts from Stack Overflow or by user309779
Published on 2010-04-16T12:41:05Z Indexed on 2010/04/16 12:43 UTC
Read the original article Hit count: 169

Filed under:

git

This is probably an easy question...

I have 4 source versions of the same software in 4 different directories. I have just started using git for version control. To date, I have just been snapping a desperate copy rolling forward.

I want to merge all versions (1.0.0.1, 1.0.0.2, 1.0.0.3, 1.0.1.0) together so that I will have a reference history.

Opposed to just starting out with 1.0.1.0 as the initial version.

I want to get this sort of thing right form the start. Can someone outline the basic steps to accomplish this?

Thanks much, XO

Related posts about git

git pull gives error: 401 Authorization Required while accessing https://git.foo.com/bar.git

as seen on Stack Overflow - Search for 'Stack Overflow'
My macbook pro is able to clone/push/pull from the company git server. My cent 6.3 vm gets a 401 error git clone https://git.acme.com/git/torque-setup "error: The requested URL returned error: 401 Authorization Required while accessing https://git.acme.com/git/torque-setup/info/refs As a work… >>> More
Can't install git on Ubuntu 12.10

as seen on Ask Ubuntu - Search for 'Ask Ubuntu'
I'm following these instructions to install git on my laptop: http://git-scm.com/download/linux When I do: $ sudo apt-get install git-core This is what my terinal shows: Reading package lists... Done Building dependency tree Reading state information... Done The following packages… >>> More
Git apache : unable to push via http

as seen on Server Fault - Search for 'Server Fault'
I have to setup a server which can allow http vcs management (such as git and svn). svn support works well, but I have some trouble with git. Actual configuration: CentOS 5 Apache 2.2.8 Git 1.7.4.1 The /etc/httpd/conf/httpd.conf content: ServerTokens OS ServerRoot "/etc/httpd" PidFile run/httpd… >>> More
git on HTTP with gitolite and nginx

as seen on Server Fault - Search for 'Server Fault'
I am trying to setup a server where my git repo would be accessible with HTTP(S). I am using gitolite and nginx (and gitlab for web interface but I doubt it makes any difference). I have searched the whole afternoon and I think I'm stuck. I have think I have understood that nginx needs fcgiwrap… >>> More
Redmine git integration - issue in accessing git from redmine but not from external git client

as seen on Server Fault - Search for 'Server Fault'
I have setup redmine integration with apache as described in the redmine documentation. I have a /git path accessible with auth and /git-private accessible only to redmine. When I clone the repository through /git path, I get the up-to-date repo. But when I try to view it in redmine repo viewer, I… >>> More

Developer IT

merging 3 source versioned trees into 1 - Developer IT

merging 3 source versioned trees into 1

git

Related posts about git

git pull gives error: 401 Authorization Required while accessing https://git.foo.com/bar.git

Can't install git on Ubuntu 12.10

Git apache : unable to push via http

git on HTTP with gitolite and nginx

Redmine git integration - issue in accessing git from redmine but not from external git client

Categories cloud