git - Pushing a commit to a branch of a forked repository -


i getting strange error when updating forked repository. created dev-branch in forked repo(for development work).

  1. i have cloned forked repo

     git clone https://github.com/twbs/bootstrap

  2. check current branch

          git branch        *master       dev-branch

  3. change dev-branch

    git checkout dev-branch

  4. make changes , commited them dev-branch

     git commit

  5. add remote url 

     git remote add parent git@github.com:twbs/bootstrap

  6. when git push now, getting error hint: updates rejected because tip of current branch behind hint: remote counterpart

  7. so, did 

        git fetch parent     git merge parent/master    new commit screen opened commit message "merge remote-tracking branch 'bootstrap/master' dev-branch"

  8. still same error, when git push

  9. now, did 

        git pull     new commit screen opened commit message "merge branch 'dev-branch' of https://github.com/username/bootsrap dev-branch
    1. now, git push worked.

i don't know has happened. did make mistake somewhere ? can point out me right steps update , push different branch of forked repository ?

what version of git using? older versions of git used default "attempt push local branches remote", appears yours tried do.

newer versions of git default attempting push checked out branch branch of same name upstream (which dislike). recommend git config --global push.default tracking (or upstream in newer versions), attempts push current branch upstream.

in case, had 2 branches, , tried push them both. both rejected because both behind.

so no mistake on part really, although if prefer linear history might want consider rebase instead of merge.


Comments

Post a Comment

Popular posts from this blog

Python Kivy ListView: How to delete selected ListItemButton? -

Image
i'm trying learn kivy building simple todo-list app suggested dusty phillips, author of book "creating apps in kivy". this code far: from kivy.app import app kivy.uix.boxlayout import boxlayout kivy.properties import objectproperty kivy.uix.listview import listitembutton class taskbutton(listitembutton): pass class todoroot(boxlayout): task_input = objectproperty() task_list = objectproperty() def add_task(self): self.task_list.adapter.data.extend([self.task_input.text]) self.task_list._trigger_reset_populate() def del_task(self): pass class todoapp(app): def build(self): return todoroot() if __name__ == '__main__': todoapp().run() and kv file: #: import main todo #: import listadapter kivy.adapters.listadapter.listadapter #: import listitembutton kivy.uix.listview.listitembutton todoroot: <todoroot>: orientation: "vertical" task_input: task_input_view t...
Read more

ruby - How do I merge two hashes into a hash of arrays? -

http://codepad.org/wmyzqlis i'd merge these 2 arrays: a = { :a => 'a', :b => 'b', :d => 'd' } b = { :a => '1', :b => 'b', :c => 'c' } into hash looks this: {:a => ["a", "1"], :b => ["b", "b"], :c => [nil, "c"], :d => ["d", nil] } this doesn't work: p a.merge(b) { |k, v1, v2| [v1, v2] } # {:c=>"c", :a=>["a", "1"], :b=>["b", "b"], :d=>"d"} it's because hash#merge call block duplicate keys. a = { :a => 'a', :b => 'b', :d => 'd' } b = { :a => '1', :b => 'b', :c => 'c' } hash[(a.keys|b.keys).map { |key| [key, [a.fetch(key, nil), b.fetch(key, nil)]] }] # => {:a=>["a", "1"], :b=>["b", "b"], :d=>["d", nil], :c=>...
Read more