Branch Management

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



I have a private git repository (private.git) on a private server
(PRIVATEREPO.COM).  That repo is updated via development on my local system.
All works great in that area.  I have 2 branches, "master" and "version".

I want to update my production system via git from the private git
repository via command line.  The production system not only contains the
files from the repo, but also additional files and directories.  I need
those files to be left alone.

I was able to successful clone just the "master" branch using:

# git clone -b master git_user@xxxxxxxxxxxxxxx:private.git production.git

I am now ready to move the new "version" branch.  
1.  How can I do that?

The "version" branch contains some new files that are not in the "master"
branch.

Now suppose that I move to the "version" branch, but determine that I need
to go back to the "master" branch.

2.  How do I go back to the "master" branch and remove any of the new files
that were uploaded from the "version" branch?  I don't want any remnants
that the "version" branch was even there.

Hopefully someone can head me in the right direction.

Thanks!




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux