Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>You are over thinking this. The message isn't saying the remote is behind. It's saying your local repository's recorded commit for 'origin/master' is. At no point in generating that message did git communicate with a remote. It simply looked into the .git directory, and returned the contents of <code>.git/refs/remotes/origin/master</code>. Try it yourself. Both of these commands should return the same thing from the top-level of the repository:</p> <pre><code>cat .git/refs/remotes/origin/master git rev-parse origin/master </code></pre> <p>The second command is simply a plumbing command for finding the 'origin/master' pointer. You could replace 'origin/master' with any branch to get the most recent commit on that branch.</p> <p>That message is telling you is that your local 'master' is ahead of the commit returned by 'git rev-parse origin/master' by 857 commits. How did this situation arise? I can't say exactly, but I'd put considerable money on you accidentally merging a different branch into 'master'. Every time I've seen this problem, it's a bad merge from user error.</p> <p>First, issue <code>git fetch origin</code> to make sure that 'origin/master' pointer is up-to-date. Then, study your <code>git log</code>. Look for something recent you don't expect. Download a <a href="http://jonas.nitro.dk/tig/">program like tig</a> or use <code>gitk</code> to get a visual graph of your commit history. It's a good bet you accidentally issued <code>git pull stable</code> while checked out on 'master'. Or something similar.</p>
    singulars
    1. This table or related slice is empty.
    1. POwhy does it say "Your branch is ahead of origin/master by 857 commits" when I need to *pull* origin master
      singulars
      1. PTQuestion
    1. PTAnswer
    1. This table or related slice is empty.
    1. USChristopher
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. POwhy does it say "Your branch is ahead of origin/master by 857 commits" when I need to *pull* origin master
      singulars
      1. PTQuestion
    1. This table or related slice is empty.
    1. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTAcceptedByOriginator
    3. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    1. COThanks, I think you have helped me find what had happened... I had merged a branch into `master` but I hadn't pushed that change. In the meantime others had pushed their changes to the remote, so when I pulled it looked like I was resolving everything by doing so.
      singulars
      1. PO
      1. USAnentropic
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

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