Show pageHistoryMedia Last modified: 2018/06/29 10:56 by bluesabre

Sitemap

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
Next revision
Previous revision
devel:git [2018/06/04 09:53]
bluesabre
devel:git [2018/06/29 10:56]
bluesabre
Line 37: Line 37:
 ==== Linking Series to Git Branches ==== ==== Linking Series to Git Branches ====
  
-This is currently not possible. There is not much functionality lost here.+This is currently not possible. Series only help to identify which code branches are associated with each version lines. Instead, consider pushing each version line as a separate branch in your project.
  
 ==== Translation Imports & Exports ==== ==== Translation Imports & Exports ====
Line 75: Line 75:
 git remote add myremote lp:~myusername/xubuntu-docs/myfeaturebranch # Adds the remote repository location git remote add myremote lp:~myusername/xubuntu-docs/myfeaturebranch # Adds the remote repository location
 git push --set-upstream myremote myfeaturebranch</code> git push --set-upstream myremote myfeaturebranch</code>
 +
 +==== Merging a Branch ====
 +
 +<code># clone your branch
 +git clone lp:lightdm-gtk-greeter
 +cd lightdm-gtk-greeter
 +
 +# fetch the remote branch
 +git remote add remotename https://git.launchpad.net/~username/lightdm-gtk-greeter
 +git fetch remotename
 +git merge remotename/master
 +
 +# push the merge
 +git push</code>
  
 ===== Git Repositories ===== ===== Git Repositories =====