{"thread":{"id":"35672","subject":"Rebase with remote branch?","startedAt":"2014-01-16T17:23:31Z","lastAt":"2014-01-16T17:23:31Z","messageCount":1,"participants":["Robert Dailey"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"233208","messageId":"CAHd499DQmEqt44u71xn_FPumbPpJgNmTOnhA0C4BTG_-B+9ODQ@mail.gmail.com","threadId":"35672","inReplyTo":null,"subject":"Rebase with remote branch?","fromName":"Robert Dailey","fromEmail":"rcdailey.lists@gmail.com","sentAt":"2014-01-16T17:23:31Z","receivedAt":"2014-01-16T17:23:31Z","isPatch":false,"sender":{"key":"rcdailey.lists@gmail.com","avatar":null},"body":"I have two branches, 'master' and 'work'. 'master' I never work out\nof, and I merge changes into it from another SVN repository (I do not\nuse git-svn, I do this all by hand as real git commits). My 'work'\nbranch is technically my 'master' in the git-trunk sense, as that is\nmy personal main line of development and I merge directly to 'master'\nfrom 'work'. I like to rebase 'work' onto 'master' but by doing so, I\nhave to 'git push --force origin work' due to the fact that the rebase\nputs my current branch behind origin/work.\n\nShould I stick to merging between 'master' and 'work' only ? Rebase is\nonly for local-only branches, right?\n"}]}