There are a few git commands that we use when working with the OpenHAB and helper library repositories. The OpenHAB Eclipse project sets uses a split push\/pull repository where the *fetch* repo is the organization and the *push* repo is your personal repo. This is reasonable because you do not have permissions to write to the organizational repository. You can use the same split-repository setup for other projects. Clone the project either from the organization’s repo, and then change the push URL to your personal repository.<\/p>\n
# Show list of remotes
\n[lisa@linux ~]# git remote -v
\norigin https:\/\/github.com\/openhab-scripters\/openhab-helper-libraries (fetch)
\norigin https:\/\/github.com\/openhab-scripters\/openhab-helper-libraries (push)<\/p>\n
# Set push remote to PERSONAL repository
\n[lisa@linux ~]# git remote set-url –push origin https:\/\/github.com\/ljr55555\/openhab-helper-libraries<\/p>\n
# Show list of remotes — verification step
\n[lisa@linux ~]# git remote -v
\norigin https:\/\/github.com\/openhab-scripters\/openhab-helper-libraries (fetch)
\norigin https:\/\/github.com\/ljr55555\/openhab-helper-libraries (push)<\/p>\n
While the split repository setup prevents accidentally attempting to push changes to a repo to which you lack write access, I find it a little confusing. Instead, I add specific repos for ORG (the organizational repo) and my personal repo. # Add ORG repo with organizational repo URL # Scenario: Someone has updated ORG master branch # Scenario: Someone has updated ORG master branch. <\/p>\n And a few misc commands that I want to remember # Set username and e-mail address # merge gone bad, bail! # Forgot to add sign-off on commit There are a few git commands that we use when working with the OpenHAB and helper library repositories. The OpenHAB Eclipse project sets uses a split push\/pull repository where the *fetch* repo is the organization and the *push* repo is your personal repo. This is reasonable because you do not have permissions to write to …<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[33],"tags":[233],"class_list":["post-5349","post","type-post","status-publish","format-standard","hentry","category-coding","tag-git"],"_links":{"self":[{"href":"https:\/\/www.rushworth.us\/lisa\/index.php?rest_route=\/wp\/v2\/posts\/5349","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.rushworth.us\/lisa\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.rushworth.us\/lisa\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.rushworth.us\/lisa\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.rushworth.us\/lisa\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=5349"}],"version-history":[{"count":1,"href":"https:\/\/www.rushworth.us\/lisa\/index.php?rest_route=\/wp\/v2\/posts\/5349\/revisions"}],"predecessor-version":[{"id":5350,"href":"https:\/\/www.rushworth.us\/lisa\/index.php?rest_route=\/wp\/v2\/posts\/5349\/revisions\/5350"}],"wp:attachment":[{"href":"https:\/\/www.rushworth.us\/lisa\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=5349"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.rushworth.us\/lisa\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=5349"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.rushworth.us\/lisa\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=5349"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}
\nThe drawback to this configuration is that you *can* attempt to push changes directly to the organization repo — which will either yield an error because you lack access or will inadvertently publish code in the org repo because you don’t<\/em> lack access.<\/p>\n
\n[lisa@linux ~]# git remote add ORG https:\/\/github.com\/openhab-scripters\/openhab-helper-libraries
\n# Add LJR repo with personal fork URL
\n[lisa@linux ~]# git remote add LJR https:\/\/github.com\/ljr55555\/openhab-helper-libraries
\n[lisa@linux ~]# git remote -v
\nLJR https:\/\/github.com\/ljr55555\/openhab-helper-libraries (fetch)
\nLJR https:\/\/github.com\/ljr55555\/openhab-helper-libraries (push)
\nORG https:\/\/github.com\/openhab-scripters\/openhab-helper-libraries (fetch)
\nORG https:\/\/github.com\/openhab-scripters\/openhab-helper-libraries (push)
\norigin https:\/\/github.com\/openhab-scripters\/openhab-helper-libraries (fetch)
\norigin https:\/\/github.com\/ljr55555\/openhab-helper-libraries (push)<\/p>\n
\n# I want to incorporate those changes into PERSONAL master branch and push them into my repo
\n[lisa@linux ~]# git checkout master # Switch to your local master branch
\n[lisa@linux ~]# git fetch ORG\/master # Get changes from Organization master
\n[lisa@linux ~]# git rebase ORG\/master # Apply those changes to local master
\n[lisa@linux ~]# git push –force LJR master # Overwrite personal repo master with updated info<\/p>\n
\n# I want to incorporate those changes in PERSONAL lucid-migration branch
\n[lisa@linux ~]# git checkout master # Switch to your local master branch
\n[lisa@linux ~]# git fetch ORG\/master # Get changes from Organization master
\n[lisa@linux ~]# git rebase ORG\/master # Apply those changes to local master
\n[lisa@linux ~]# git checkout lucid-migration # Switch back to your local lucid-migration branch
\n[lisa@linux ~]# git rebase –preserve-merges master # Rebase your local lucid-migration (checked out branch) onto local master
\n[lisa@linux ~]# git push –force-with-lease LJR lucid-migration # Overwrite personal repo lucid-migration branch with updated info<\/p>\n
\n# Check username and email
\n[lisa@linux ~]# git config –list<\/p>\n
\n[lisa@linux ~]# git config –global user.name “FIRST_NAME LAST_NAME”
\n[lisa@linux ~]# git config –global user.email “MY_NAME@example.com”<\/p>\n
\n[lisa@linux ~]# git merge –abort<\/p>\n
\n[lisa@linux ~]# git commit –amend<\/p>\n","protected":false},"excerpt":{"rendered":"