-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathremote-server.html
85 lines (69 loc) · 5.11 KB
/
remote-server.html
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
<!DOCTYPE html>
<html lang="en">
<!--
Website: Intro to Git
Page: remote-server.html
Author: Kevin Robell
Purpose: This page teaches the user how use the clone, pull, and push git commands.
-->
<head>
<meta charset="utf-8" />
<title> Intro to Git </title>
<link href="css/sta.css" rel="stylesheet" type="text/css" />
<link href="css/styles.css" rel="stylesheet" type="text/css" />
</head>
<body class="body">
<header class="header">
<h1 class="title-txt"> What is </h1>
<img id="logo" src="img/Git-Logo-Black.png" alt="git logo" />
<h1 class="title-txt"> ? </h1>
</header>
<nav class="nav">
<a href="index.html">Home</a>
<a href="starting.html">Starting Out</a>
<a href="branching.html">Branching</a>
<a id="current-page" href="remote-server.html">Remote Server</a>
</nav>
<div class="box w4">
<h2> Remote Server </h2>
<hr>
Git becomes much more valuable when multiple people can collaborate on the same project. This is accomplished by hosting the repo on a remote server. Users occasionally download new changes from the remote repo and upload new changes to the remote repo. Using git with a remote server or website differs slightly depending upon the installation. There are websites like github, gitlab, and gitbucket which will manage your remote repos for you; git can also be installed directly on private servers. Consult those sites for more information. For this section of the tutorial, I will show you the general commands which will be the same across all platforms. Sadly, you won’t be able to follow along like before.
</div>
<div class="box w3">
We often don’t start new projects from scratch. Instead, we are contributing to mature codebases. Git allows us to make a local copy of a codebase by typing <code>git clone <repo url></code>.
</div>
<img src="img/remote_page-console-1.png" alt="Console window showing how to clone a repository using the git clone command." />
<div class="box w3">
Once we have a local clone of the repo, it will function like the repo we created at the beginning of the tutorial. The only difference is that other users can make changes to the remote repo too. To download the newest changes from the remote repo type <code>git pull</code>. This is a combination of the commands <code>git fetch</code>(which grabs the newest changes from the remote repo) and <code>git merge</code>(which tries to merge those changes into your current branch. It may result in a merge conflict which you will have to solve by looking at the diff.
</div>
<img src="img/remote_page-console-2.png" alt="Console window showing how to pull from a remote repository using the git pull command." />
<div class="box w3">
You can make changes to the local repo as shown earlier in this tutorial. Add your changed files and make a commit. To add these changes to the remote repo type <code>git push</code>. It may also result in merge conflicts that you will have to resolve.
</div>
<img src="img/remote_page-console-3.png" alt="Console window showing how to push to a remote repository using the git push command." />
<div class="box w4">
<h2> Ending Tips </h2>
<hr>
You’ve made it to the end of the tutorial. You now know enough about git to be dangerous. Here are two basic tips for how git should be used.
<ol>
<li>Never make changes directly on the master branch(origin). Always make a new branch and then merge those changes in when they are ready.</li>
<li>Before pushing your commits always pull from the server/website.</li>
</ol>
Be sure to review this tutorial if you’re unsure about anything or seek out other resources. I’ve included some of my favorite resources below that I consulted while building this website.
</div>
<div id="references" class="box w3">
<h2> Additional Resources </h2>
<hr>
<ul>
<li><a href="http://rogerdudler.github.io/git-guide/"> git - the simple guide </a>: This resource shows a detailed list of git commands and their functions.</li>
<li><a href="https://github.com/git-guides/">Github - Git Guide</a>: This resources shows detailed explanations of how git commands work and when to use them.</li>
<li><a href="https://git-scm.com/book">Pro Git</a>: This book details how to the git program works, how to use it, and how to install git on your own server. Very detailed!</li>
</ul>
</div>
<footer class="footer">
CST336 Internet Programming. 2020© Robell<br>
<a href="https://git-scm.com/downloads/logos" target="_blank">Git Logo</a> by <a href="https://twitter.com/jasonlong" target="_blank">Jason Long</a>.
Built using <a href="https://apainintheneck.github.io/sta.css/" target="_blank">sta.css</a>.
</footer>
</body>
</html>