StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

PO
text
Body
copied!<p>Let me rework your example for clarity.</p> <pre><code> C-D-E < topic, origin/topic / A-B < master, origin/master </code></pre> <p>Then someone does work.</p> <pre><code> C-D-E < topic, origin/topic / A-B-F-G < origin/master ^ master </code></pre> <p>You fetched F & G from origin, and then rebased topic onto master. So now your repository looks like this.</p> <pre><code> C-D-E < origin/topic / A-B-F-G < master, origin/master \ C'-D'-E' < topic </code></pre> <p>And this is the problem. origin/topic at E can not be fast-forwarded to topic at E'. Rebase is really only meant for commits that have not been pushed to origin. Since you pushed C, D, and E to origin/topic already, you would have to rewrite history on the remote repository. Hence the error. So you really have three options:</p> <ol> <li><p>Stop pushing a topical branch. If it's only you who is working on topic, there's no need to push it. Just keep rebasing topic on top of master, and when done, fast-forward merge master to topic & push master. Delete local topic branch. Voila!</p></li> <li><p>Merge topic & master. If you need to collaborate on a topical branch, you should probably suck it up and merge.</p></li> <li><p>Force the remote rebase:</p> <p>git push origin topic -f</p> <p>This will force origin/topic to E'. Except by re-writing history in the remote repository, you'll have fire and brimstone, human sacrifice, dogs and cats living together, mass hysteria... and your fellow developers not liking you very much. Not recommended at all.</p></li> </ol>

Querying!

Guidance

An individual column

Larger individual text columns get their own page to allow for proper reading.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload