Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>It looks like the question <a href="http://git.or.cz/gitwiki/GitFaq#Whywon.27tIseechangesintheremoterepoafter.22gitpush.22.3F" rel="nofollow noreferrer">Why won't I see changes in the remote repo after "git push"?</a></p> <blockquote> <p>The <code>push</code> operation is always about propagating the repository history and updating the refs, and <strong>never touches the working tree files</strong>.<br> In particular, if you push to update the branch that is checked out in a remote repository the files in the work tree will not be updated.</p> <p>This is a precautionary design decision.<br> The remote repository's work tree may have local changes, and there is no way for you, who are pushing into the remote repository, to resolve conflicts between the changes you are pushing and the ones in the work tree</p> </blockquote> <p>As said, a <a href="https://stackoverflow.com/questions/738154/what-does-git-updating-currently-checked-out-branch-warning-mean">bare remote repo</a> is better here.<br> You can setup a non-bare repo in the same place than <code>MAIN CODEBASE</code>, in order to see the changes in <em>that</em> "non-bare main codebase repo".</p> <p>Note: with the <a href="http://blog.avirtualhome.com/2010/01/02/preparing-yourselves-for-compatibility-issues-in-git-1-7-0/" rel="nofollow noreferrer">upcoming Git 1.7</a>, <code>git push</code> into a branch that is currently checked out (i.e. pointed by HEAD in a repository that is not bare) will be refused by default. </p> <p><code>git pull</code> should not overwrite anything, at least not <a href="http://slacy.com/blog/2009/09/git-pull-says-untracked-working-tree-file-would-be-overwritten-by-merge/" rel="nofollow noreferrer">without big warnings</a>. Do you see any of those warning messages?</p> <hr> <p>As <a href="https://stackoverflow.com/users/223632/kibitzer">kibitzer</a> aptly describes in the comment:</p> <blockquote> <p><code>bare</code> means a repository which does not contain the actual files, just the metadata (commits). Pushes to such repository are safe because no discrepancy is generated between the state of files on disk and commits in <code>.git</code></p> </blockquote> <p>The fact that this remote repo is "empty" (it only has the <code>.git</code> folder, but no file checked-out) does not mean a <a href="http://git-scm.com/docs/git-clone" rel="nofollow noreferrer"><code>git clone</code></a> will result in an empty local repo.<br> It will create and check-out an initial branch that is forked from the cloned repository's currently active branch.</p> <hr> <p>So, the "publication architecture" would be:</p> <pre><code>/--- | MAIN SERVER : [ BARE-MAIN-REPO ] == (pull only) ==&gt; [ MAIN-REPO ] \--- ^^ || ^^ || || || || || push pull push pull || || || || /--- || vv || || |DEV1 PC : [ DEV1 REPO ] || || \--- || || || || /--- || vv |DEV2 PC : [ DEV2 REPO ] \--- </code></pre> <p>Note: if you refer to the <a href="http://www.kernel.org/pub//software/scm/git/docs/v1.5.1.6/glossary.html" rel="nofollow noreferrer">Git Glossary</a>, what "origin" means is the default <em>upstream</em> repository.<br> <code>Bare-main-Repo</code> is the "origin", i.e. the default upstream repo for <code>dev1</code> and <code>dev2</code>, meaning both those repos wll have been created by cloning <code>Bare-main-Repo</code>.<br> (Nothing prevents you to add other upstream repos: dev1 could add dev2 as another upstream repo, allowing to pull directly from dev2 for instance)</p>
    singulars
    1. This table or related slice is empty.
    1. POGIT: How to see pulled/pushed changes in origin
      singulars
      1. PTQuestion
    1. PTAnswer
    1. USCommunity
    1. USVonC
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. POGIT: How to see pulled/pushed changes in origin
      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. VTUpMod
    3. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    1. COOf course I'm aware of your reference to the FAQ, but I'm failing to see the point of being unable to return a modified clone to a central point. How do I get to a situation where I for example, can make changes to PHP and my designer can make changes to templates and we can merge our changes so that a third person can checkout the latest version?
      singulars
      1. PO
      1. USLeo
    2. COI have not yet found an understandable explanation of what a bare repo is, nor how to merge it back into the non-bare. One point of confusion is the reference to working copies and remote repos - what is the original called and what is my local copy called? If the original is untouchable why does it exist? Git pull overwrote quietly.
      singulars
      1. PO
      1. USLeo
    3. COSee also http://stackoverflow.com/questions/738154/what-does-git-updating-currently-checked-out-branch-warning-mean
      singulars
      1. PO
      1. USVonC
 

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