963 shaares
4 results
tagged
remote
There are 2 ways in which git merge (or a git pull, which is a git fetch and then a git merge) can fail:
To be able to collaborate on any Git project, you need to know how to manage your remote repositories. Remote repositories are versions of your project that are hosted on the Internet or network somewhere. You can have several of them, each of which generally is either read-only or read/write for you. Collaborating with others involves managing these remote repositories and pushing and pulling data to and from them when you need to share work. Managing remote repositories includes knowing how to add remote repositories, remove remotes that are no longer valid, manage various remote branches and define them as being tracked or not, and more. In this section, we’ll cover some of these remote-management skills.
Although most of server's configuration and administration is done from the command line, occasionally it’s helpful to have access to GUI applications. Since the machines are remote, and tightly constrained in terms of memory, it makes sense to use the lightest option available. The setup described use the tightvnc VNC server in conjunction with the fluxbox window manager. It’s not very pretty, but it does work. Using SSH tunneling, it’s also quite secure.
How to : git remote repository