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
devel:git [2018/06/04 09:59]
bluesabre
devel:git [2018/06/29 10:56] (current)
bluesabre
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 =====