Differences
This shows you the differences between two versions of the page.
Both sides previous revisionPrevious revisionNext revision | Previous revision | ||
devel:git [2018/06/04 09:53] – bluesabre | devel:git [2018/06/29 10:56] (current) – bluesabre | ||
---|---|---|---|
Line 37: | Line 37: | ||
==== Linking Series to Git Branches ==== | ==== Linking Series to Git Branches ==== | ||
- | This is currently not possible. | + | This is currently not possible. |
==== Translation Imports & Exports ==== | ==== Translation Imports & Exports ==== | ||
Line 75: | Line 75: | ||
git remote add myremote lp: | git remote add myremote lp: | ||
git push --set-upstream myremote myfeaturebranch</ | git push --set-upstream myremote myfeaturebranch</ | ||
+ | |||
+ | ==== Merging a Branch ==== | ||
+ | |||
+ | < | ||
+ | git clone lp: | ||
+ | cd lightdm-gtk-greeter | ||
+ | |||
+ | # fetch the remote branch | ||
+ | git remote add remotename https:// | ||
+ | git fetch remotename | ||
+ | git merge remotename/ | ||
+ | |||
+ | # push the merge | ||
+ | git push</ | ||
===== Git Repositories ===== | ===== Git Repositories ===== |