{"id":1123,"date":"2016-05-06T12:16:57","date_gmt":"2016-05-06T12:16:57","guid":{"rendered":"https:\/\/www.taywa.ch\/blog\/?p=1123"},"modified":"2018-08-08T15:56:12","modified_gmt":"2018-08-08T15:56:12","slug":"git-und_github","status":"publish","type":"post","link":"https:\/\/www.taywa.ch\/blog\/allgemein\/git-und_github\/","title":{"rendered":"git und gitub"},"content":{"rendered":"

 <\/p>\n

wenn man auf github einenb\u00a0fork gemacht hat und diesen mit dem orignal master updaten will:<\/p>\n

 <\/p>\n

https:\/\/help.github.com\/articles\/configuring-a-remote-for-a-fork\/<\/p>\n

https:\/\/help.github.com\/articles\/syncing-a-fork\/<\/p>\n

neuer branch machen:<\/p>\n

git branch sync && git checkout sync<\/pre>\n
git fetch upstream && git merge upstream\/master<\/span><\/pre>\n
Wenn es zu konflikten kommt, diese l\u00f6sen und dann:<\/p>\n
git commit -a -m \"sync fork from master\"<\/span><\/pre>\n
<\/pre>\n
Lokal neuer Branch machen:<\/p>\n
git branch new && git checkout new<\/pre>\n
und dann branch (local) zu \u00a0remot\u00a0(github)\u00a0pushen:<\/p>\n
git push --set-upstream origin new<\/pre>\n
Auf dem Server remot branch von github updaten:<\/p>\n
git fetch && git checkout new<\/pre>\n
Remote Branch l\u00f6schen:<\/p>\n
git push origin :new<\/pre>\n
Commiten<\/strong><\/h2>\n
git commit -a -m 'first commit'<\/pre>\n
Wenn nicht gepushed kann einfach einen commit hinzugef\u00fcgt werden<\/p>\n
git commit -a --amend<\/pre>\n
<\/h2>\n
Zusammenfassen mehrerer Commits<\/h2>\n
mit reset –soft:<\/p>\n
git reset --soft HEAD~3\r\ngit commit -a -m '[TASK] Ja, zusammen'\r\ngit push origin +master\r\n<\/pre>\n
Mergen<\/strong><\/h2>\n
In Branch sync<\/strong> in den master<\/strong> mergen:<\/p>\n
git checkout master &&  git merge sync<\/pre>\n","protected":false},"excerpt":{"rendered":"
  wenn man auf github einenb\u00a0fork gemacht hat und diesen mit dem orignal master updaten will:   https:\/\/help.github.com\/articles\/configuring-a-remote-for-a-fork\/ https:\/\/help.github.com\/articles\/syncing-a-fork\/ neuer branch machen: git branch sync && git checkout sync git fetch upstream && git merge upstream\/master Wenn es zu konflikten kommt, diese l\u00f6sen und dann: git commit -a -m „sync fork from master“ Lokal neuer<\/p>\n","protected":false},"author":3,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[],"class_list":["post-1123","post","type-post","status-publish","format-standard","hentry","category-allgemein"],"_links":{"self":[{"href":"https:\/\/www.taywa.ch\/blog\/wp-json\/wp\/v2\/posts\/1123","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.taywa.ch\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.taywa.ch\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.taywa.ch\/blog\/wp-json\/wp\/v2\/users\/3"}],"replies":[{"embeddable":true,"href":"https:\/\/www.taywa.ch\/blog\/wp-json\/wp\/v2\/comments?post=1123"}],"version-history":[{"count":5,"href":"https:\/\/www.taywa.ch\/blog\/wp-json\/wp\/v2\/posts\/1123\/revisions"}],"predecessor-version":[{"id":1145,"href":"https:\/\/www.taywa.ch\/blog\/wp-json\/wp\/v2\/posts\/1123\/revisions\/1145"}],"wp:attachment":[{"href":"https:\/\/www.taywa.ch\/blog\/wp-json\/wp\/v2\/media?parent=1123"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.taywa.ch\/blog\/wp-json\/wp\/v2\/categories?post=1123"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.taywa.ch\/blog\/wp-json\/wp\/v2\/tags?post=1123"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}