add the way to merge other user branch to network/graph...
...page
| ... | ... |
@@ -91,6 +91,31 @@ |
| 91 | 91 |
<div style="margin-bottom:30px"> |
| 92 | 92 |
<span style="color:green;font-size:22px"><%= "$remote_user / $remote_project / $remote_branch" %></span> |
| 93 | 93 |
</div> |
| 94 |
+ <hr> |
|
| 95 |
+ <div style="margin-bottom:15px"> |
|
| 96 |
+ <h4>Merging via command line</h4> |
|
| 97 |
+ you can perform a manual merge on the command line. |
|
| 98 |
+ </div> |
|
| 99 |
+ |
|
| 100 |
+ <b>Step 1:</b> If you don't add user remote repository, add it. |
|
| 101 |
+ <pre class="well" style="background:#333333;color:white;padding:20px 20px 0px 20px;"> |
|
| 102 |
+git remote add <%= $remote_user %> <%= url_for("/$remote_user/$remote_project.git")->to_abs %>
|
|
| 103 |
+ </pre> |
|
| 104 |
+ |
|
| 105 |
+ <b>Step 2:</b> From your project repository, bring in the changes and test. |
|
| 106 |
+ <pre class="well" style="background:#333333;color:white;padding:20px 20px 0px 20px;"> |
|
| 107 |
+git remote update |
|
| 108 |
+git fetch |
|
| 109 |
+git checkout -b <%= "$remote_user-$remote_branch" %> <%= "$remote_user/$remote_branch" %> |
|
| 110 |
+git merge <%= $branch %> |
|
| 111 |
+ </pre> |
|
| 112 |
+ |
|
| 113 |
+ <b>Step 3:</b> Merge the changes and update on GitHub. |
|
| 114 |
+ <pre class="well" style="background:#333333;color:white;padding:20px 20px 0px 20px;"> |
|
| 115 |
+git checkout <%= $branch %> |
|
| 116 |
+git merge <%= "$remote_user-$remote_branch" %> |
|
| 117 |
+git push origin <%= $branch %> |
|
| 118 |
+ </pre> |
|
| 94 | 119 |
</div> |
| 95 | 120 |
|
| 96 | 121 |
%= include '/include/footer'; |