github

</div><div/><div/><div><div><div><div><div><div><div><div>113</div></div><div><div>113</div></div></div><div/><div/><div><div> </div></div><div><div><div/><div/><div><div>1</div></div><pre data-from="code-for-outside" class="has"><span>[email protected]/git/demo2</span></pre></div><div><div><div>2</div></div><pre data-from="code-for-outside" class="has"><span><span>$ git</span> clone https://github.com/fadewalk/test.git</span></pre></div><div><div><div>3</div></div><pre data-from="code-for-outside" class="has"><span>Cloning into <span>'test'</span>...</span></pre></div><div><div><div>4</div></div><pre data-from="code-for-outside" class="has"><span>remote: Enumerating objects: <span>38</span>, <span>done</span>.</span></pre></div><div><div><div>5</div></div><pre data-from="code-for-outside" class="has"><span>remote: Counting objects: <span>100</span>% (38/38), <span>done</span>.</span></pre></div><div><div><div>6</div></div><pre data-from="code-for-outside" class="has"><span>remote: Compressing objects: <span>100</span>% (18/18), <span>done</span>.</span></pre></div><div><div><div>7</div></div><pre data-from="code-for-outside" class="has"><span>remote: Total <span>38</span> (delta <span>11</span>), reused <span>38</span> (delta <span>11</span>), pack-reused <span>0</span></span></pre></div><div><div><div>8</div></div><pre data-from="code-for-outside" class="has"><span>Unpacking objects: <span>100</span>% (38/38), <span>done</span>.</span></pre></div><div><div><div>9</div></div><pre data-from="code-for-outside" class="has"><span><span/></span></pre></div><div><div><div>10</div></div><pre data-from="code-for-outside" class="has"><span>[email protected]/git/demo2</span></pre></div><div><div><div>11</div></div><pre data-from="code-for-outside" class="has"><span><span>$ ls</span></span></pre></div><div><div><div>12</div></div><pre data-from="code-for-outside" class="has"><span>test/</span></pre></div><div><div><div>13</div></div><pre data-from="code-for-outside" class="has"><span><span/></span></pre></div><div><div><div>14</div></div><pre data-from="code-for-outside" class="has"><span>[email protected]/git/demo2</span></pre></div><div><div><div>15</div></div><pre data-from="code-for-outside" class="has"><span><span>$ cd</span> test/</span></pre></div><div><div><div>16</div></div><pre data-from="code-for-outside" class="has"><span><span/></span></pre></div><div><div><div>17</div></div><pre data-from="code-for-outside" class="has"><span>[email protected]/git/demo2/test (master)        <span># 发现是在master上面</span></span></pre></div><div><div><div>18</div></div><pre data-from="code-for-outside" class="has"><span><span>$ git</span> branch                              <span># 没有dev2 分支，主人没有上传dev分支</span></span></pre></div><div><div><div>19</div></div><pre data-from="code-for-outside" class="has"><span>* master                                  <span># 需要等上传了才能看</span></span></pre></div><div><div><div>20</div></div><pre data-from="code-for-outside" class="has"><span><span/></span></pre></div><div><div><div>21</div></div><pre data-from="code-for-outside" class="has"><span>[email protected]/git/demo2/test (master)</span></pre></div><div><div><div>22</div></div><pre data-from="code-for-outside" class="has"><span><span>$ cd</span> ..</span></pre></div><div><div><div>23</div></div><pre data-from="code-for-outside" class="has"><span><span/></span></pre></div><div><div><div>24</div></div><pre data-from="code-for-outside" class="has"><span>[email protected]/git/demo2</span></pre></div><div><div><div>25</div></div><pre data-from="code-for-outside" class="has"><span><span>$ ls</span></span></pre></div><div><div><div>26</div></div><pre data-from="code-for-outside" class="has"><span>test/</span></pre></div><div><div><div>27</div></div><pre data-from="code-for-outside" class="has"><span><span/></span></pre></div><div><div><div>28</div></div><pre data-from="code-for-outside" class="has"><span>[email protected]/git/demo2            <span># 来早了，先删掉，等主人上传dev了，再来。</span></span></pre></div><div><div><div>29</div></div><pre data-from="code-for-outside" class="has"><span><span>$ rm</span> <span>-fr</span> test/</span></pre></div><div><div><div>30</div></div><pre data-from="code-for-outside" class="has"><span><span/></span></pre></div><div><div><div>31</div></div><pre data-from="code-for-outside" class="has"><span>[email protected]/git/demo2</span></pre></div><div><div><div>32</div></div><pre data-from="code-for-outside" class="has"><span><span>$ git</span> clone https://github.com/fadewalk/test.git        <span># 重新克隆，应该有了吧</span></span></pre></div><div><div><div>33</div></div><pre data-from="code-for-outside" class="has"><span>Cloning into <span>'test'</span>...</span></pre></div><div><div><div>34</div></div><pre data-from="code-for-outside" class="has"><span>remote: Enumerating objects: <span>44</span>, <span>done</span>.</span></pre></div><div><div><div>35</div></div><pre data-from="code-for-outside" class="has"><span>remote: Counting objects: <span>100</span>% (44/44), <span>done</span>.</span></pre></div><div><div><div>36</div></div><pre data-from="code-for-outside" class="has"><span>remote: Compressing objects: <span>100</span>% (21/21), <span>done</span>.</span></pre></div><div><div><div>37</div></div><pre data-from="code-for-outside" class="has"><span>remote: Total <span>44</span> (delta <span>13</span>), reused <span>44</span> (delta <span>13</span>), pack-reused <span>0</span></span></pre></div><div><div><div>38</div></div><pre data-from="code-for-outside" class="has"><span>Unpacking objects: <span>100</span>% (44/44), <span>done</span>.</span></pre></div><div><div><div>39</div></div><pre data-from="code-for-outside" class="has"><span><span/></span></pre></div><div><div><div>40</div></div><pre data-from="code-for-outside" class="has"><span>[email protected]/git/demo2</span></pre></div><div><div><div>41</div></div><pre data-from="code-for-outside" class="has"><span><span>$ ls</span></span></pre></div><div><div><div>42</div></div><pre data-from="code-for-outside" class="has"><span>test/</span></pre></div><div><div><div>43</div></div><pre data-from="code-for-outside" class="has"><span><span/></span></pre></div><div><div><div>44</div></div><pre data-from="code-for-outside" class="has"><span>[email protected]/git/demo2</span></pre></div><div><div><div>45</div></div><pre data-from="code-for-outside" class="has"><span><span>$ cd</span> test/</span></pre></div><div><div><div>46</div></div><pre data-from="code-for-outside" class="has"><span><span/></span></pre></div><div><div><div>47</div></div><pre data-from="code-for-outside" class="has"><span>[email protected]/git/demo2/test (master)</span></pre></div><div><div><div>48</div></div><pre data-from="code-for-outside" class="has"><span><span>$ ls</span></span></pre></div><div><div><div>49</div></div><pre data-from="code-for-outside" class="has"><span>index.html main.js readme.md style.css</span></pre></div><div><div><div>50</div></div><pre data-from="code-for-outside" class="has"><span><span/></span></pre></div><div><div><div>51</div></div><pre data-from="code-for-outside" class="has"><span>[email protected]/git/demo2/test (master)</span></pre></div><div><div><div>52</div></div><pre data-from="code-for-outside" class="has"><span><span>$ git</span> branch <span>-r</span>                            <span># 查看远程分支都有哪些</span></span></pre></div><div><div><div>53</div></div><pre data-from="code-for-outside" class="has"><span> origin/HEAD <span>-</span>> origin/master             <span># 发现有自己想要的dev 分支了</span></span></pre></div><div><div><div>54</div></div><pre data-from="code-for-outside" class="has"><span> origin/dev2</span></pre></div><div><div><div>55</div></div><pre data-from="code-for-outside" class="has"><span> origin/master</span></pre></div><div><div><div>56</div></div><pre data-from="code-for-outside" class="has"><span><span/></span></pre></div><div><div><div>57</div></div><pre data-from="code-for-outside" class="has"><span>[email protected]/git/demo2/test (master)</span></pre></div><div><div><div>58</div></div><pre data-from="code-for-outside" class="has"><span><span>$ git</span> branch <span>-a</span>                            <span># 查看所有分支。本地只有一个master</span></span></pre></div><div><div><div>59</div></div><pre data-from="code-for-outside" class="has"><span>* master</span></pre></div><div><div><div>60</div></div><pre data-from="code-for-outside" class="has"><span> remotes/origin/HEAD <span>-</span>> origin/master</span></pre></div><div><div><div>61</div></div><pre data-from="code-for-outside" class="has"><span> remotes/origin/dev2</span></pre></div><div><div><div>62</div></div><pre data-from="code-for-outside" class="has"><span> remotes/origin/master</span></pre></div><div><div><div>63</div></div><pre data-from="code-for-outside" class="has"><span><span/></span></pre></div><div><div><div>64</div></div><pre data-from="code-for-outside" class="has"><span><span/></span></pre></div><div><div><div>65</div></div><pre data-from="code-for-outside" class="has"><span>[email protected]/git/demo2/test (master)</span></pre></div><div><div><div>66</div></div><pre data-from="code-for-outside" class="has"><span><span>$ cat</span> readme.md</span></pre></div><div><div><div>67</div></div><pre data-from="code-for-outside" class="has"><span>bug <span>fix</span><span>=</span>>master</span></pre></div><div><div><div>68</div></div><pre data-from="code-for-outside" class="has"><span>[email protected]/git/demo2/test (master)            <span># 那就本地就根据(跟踪)远程origin的dev创建dev </span></span></pre></div><div><div><div>69</div></div><pre data-from="code-for-outside" class="has"><span><span>$ git</span> checkout <span>-b</span> dev2 origin/dev2            </span></pre></div><div><div><div>70</div></div><pre data-from="code-for-outside" class="has"><span>Switched to a new branch <span>'dev2'</span></span></pre></div><div><div><div>71</div></div><pre data-from="code-for-outside" class="has"><span>Branch <span>'dev2'</span> <span>set</span> up to track remote branch <span>'dev2'</span> from <span>'origin'</span>.</span></pre></div><div><div><div>72</div></div><pre data-from="code-for-outside" class="has"><span><span/></span></pre></div><div><div><div>73</div></div><pre data-from="code-for-outside" class="has"><span><span/></span></pre></div><div><div><div>74</div></div><pre data-from="code-for-outside" class="has"><span><span/></span></pre></div><div><div><div>75</div></div><pre data-from="code-for-outside" class="has"><span>[email protected]/git/demo2/test (dev2)</span></pre></div><div><div><div>76</div></div><pre data-from="code-for-outside" class="has"><span><span>$ git</span> branch <span>-a</span>                               <span># 好了现在本地也有dev分支了，可以修改开发dev了</span></span></pre></div><div><div><div>77</div></div><pre data-from="code-for-outside" class="has"><span>* dev2</span></pre></div><div><div><div>78</div></div><pre data-from="code-for-outside" class="has"><span> master</span></pre></div><div><div><div>79</div></div><pre data-from="code-for-outside" class="has"><span> remotes/origin/HEAD <span>-</span>> origin/master</span></pre></div><div><div><div>80</div></div><pre data-from="code-for-outside" class="has"><span> remotes/origin/dev2</span></pre></div><div><div><div>81</div></div><pre data-from="code-for-outside" class="has"><span> remotes/origin/master</span></pre></div><div><div><div>82</div></div><pre data-from="code-for-outside" class="has"><span><span/></span></pre></div><div><div><div>83</div></div><pre data-from="code-for-outside" class="has"><span>[email protected]/git/demo2/test (dev2)</span></pre></div><div><div><div>84</div></div><pre data-from="code-for-outside" class="has"><span><span>$ cat</span> readme.md</span></pre></div><div><div><div>85</div></div><pre data-from="code-for-outside" class="has"><span>branch <span>dev</span><span>===</span>>master</span></pre></div><div><div><div>86</div></div><pre data-from="code-for-outside" class="has"><span><span/></span></pre></div><div><div><div>87</div></div><pre data-from="code-for-outside" class="has"><span><span/></span></pre></div><div><div><div>88</div></div><pre data-from="code-for-outside" class="has"><span><span/></span></pre></div><div><div><div>89</div></div><pre data-from="code-for-outside" class="has"><span>B 提交的</span></pre></div><div><div><div>90</div></div><pre data-from="code-for-outside" class="has"><span><span/></span></pre></div><div><div><div>91</div></div><pre data-from="code-for-outside" class="has"><span>在A查看</span></pre></div><div><div><div>92</div></div><pre data-from="code-for-outside" class="has"><span><span/></span></pre></div><div><div><div>93</div></div><pre data-from="code-for-outside" class="has"><span>[email protected] MINGW64 /e/PlayData/git/demo1 ((57253a1...))</span></pre></div><div><div><div>94</div></div><pre data-from="code-for-outside" class="has"><span><span>$ git</span> status</span></pre></div><div><div><div>95</div></div><pre data-from="code-for-outside" class="has"><span>HEAD detached at origin/dev2</span></pre></div><div><div><div>96</div></div><pre data-from="code-for-outside" class="has"><span>nothing to commit, working tree clean</span></pre></div><div><div><div>97</div></div><pre data-from="code-for-outside" class="has"><span><span/></span></pre></div><div><div><div>98</div></div><pre data-from="code-for-outside" class="has"><span>[email protected] MINGW64 /e/PlayData/git/demo1 ((57253a1...))</span></pre></div><div><div><div>99</div></div><pre data-from="code-for-outside" class="has"><span><span>$ cat</span> readme.md</span></pre></div><div><div><div>100</div></div><pre data-from="code-for-outside" class="has"><span>hello from stuB</span></pre></div><div><div><div>101</div></div><pre data-from="code-for-outside" class="has"><span><span/></span></pre></div><div><div><div>102</div></div><pre data-from="code-for-outside" class="has"><span>[email protected] MINGW64 /e/PlayData/git/demo1 ((57253a1...))</span></pre></div><div><div><div>103</div></div><pre data-from="code-for-outside" class="has"><span><span>$ git</span> checkout dev2</span></pre></div><div><div><div>104</div></div><pre data-from="code-for-outside" class="has"><span>Previous HEAD position was 57253a1 modify readme.md at stuB on dev2</span></pre></div><div><div><div>105</div></div><pre data-from="code-for-outside" class="has"><span>Switched to branch <span>'dev2'</span></span></pre></div><div><div><div>106</div></div><pre data-from="code-for-outside" class="has"><span>Your branch and <span>'origin/dev2'</span> have diverged,</span></pre></div><div><div><div>107</div></div><pre data-from="code-for-outside" class="has"><span>and have <span>3</span> and <span>1</span> different commits each, respectively.</span></pre></div><div><div><div>108</div></div><pre data-from="code-for-outside" class="has"><span> (use <span>"git pull"</span> to merge the remote branch into yours)</span></pre></div><div><div><div>109</div></div><pre data-from="code-for-outside" class="has"><span><span/></span></pre></div><div><div><div>110</div></div><pre data-from="code-for-outside" class="has"><span>[email protected] MINGW64 /e/PlayData/git/demo1 (dev2)</span></pre></div><div><div><div>111</div></div><pre data-from="code-for-outside" class="has"><span><span>$ cat</span> readme.md</span></pre></div><div><div><div>112</div></div><pre data-from="code-for-outside" class="has"><span>this demo1A dev</span></pre></div><div><div><div>113</div></div><pre data-from="code-for-outside" class="has"><span><span/></span></pre></div></div></div></div></div></div><div/><div><div/></div></div></div></div></div><div><br/></div><div><br/></div><div>git pull 更新远程的分支并合并到本地    。少用</div><div><br/></div><div>git fetch</div><div>    merge<br/></div><div><br/></div><div data-mode="Shell" data-theme="monokai" id="wiz_cm_1540738990328_7577"><textarea readonly="readonly"># git fetch 同步远程更新 # 看是不是自己想要的跟新，然后再merge $ git fetch origin dev2 remote: Enumerating objects: 5, done. remote: Counting objects: 100% (5/5), done. remote: Compressing objects: 100% (1/1), done. remote: Total 3 (delta 1), reused 3 (delta 1), pack-reused 0 Unpacking objects: 100% (3/3), done. From https://github.com/fadewalk/test * branch dev2 -> FETCH_HEAD 0b93d1e..cc7b6f1 dev2 -> origin/dev2 [email protected] MINGW64 /e/PlayData/git/demo2/test (dev2) $ git checkout remotes/origin/dev2 Note: checking out 'remotes/origin/dev2'. You are in 'detached HEAD' state. You can look around, make experimental changes and commit them, and you can discard any commits you make in this state without impacting any branches by performing another checkout. If you want to create a new branch to retain commits you create, you may do so (now or later) by using -b with the checkout command again. Example: git checkout -b <new-branch-name> HEAD is now at cc7b6f1 modify readme.md to A [email protected] MINGW64 /e/PlayData/git/demo2/test ((cc7b6f1...)) $ git status HEAD detached at origin/dev2 nothing to commit, working tree clean [email protected] MINGW64 /e/PlayData/git/demo2/test ((cc7b6f1...)) $ cat readme.md from A [email protected] MINGW64 /e/PlayData/git/demo2/test ((cc7b6f1...)) $ git checkout dev2 Previous HEAD position was cc7b6f1 modify readme.md to A Switched to branch 'dev2' [email protected] MINGW64 /e/PlayData/git/demo2/test (dev2) $ cat readme.md A [email protected] MINGW64 /e/PlayData/git/demo2/test (dev2) $ git merge origin/dev2 --no-ff Merge made by the 'recursive' strategy. readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) [email protected] MINGW64 /e/PlayData/git/demo2/test (dev2) $ cat readme.md from A