Databases
StackOverflow2013
Postsdbo
POgit checkout remote branch shows extraneous files?
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POgit checkout remote branch shows extraneous files?
    primarykey
    data
    text
    <p>master branch has these files and folders (simplified):</p> <pre><code>C:\Local\TickZoom\Project&gt;ls file.txt name.txt public </code></pre> <p>public branch is tracking a vendor repository and has been subtree merged as public folder in master branch above. public has three folders only (simplified):</p> <pre><code>C:\Local\TickZoom\Project&gt;ls platform providers www </code></pre> <p>When switching from public to master it behaves correctly.</p> <p>However, when switching from master to public, an odd thing happens. It has all the files and folders of both combined:</p> <pre><code>C:\Local\TickZoom\Project&gt;git checkout public C:\Local\TickZoom\Project&gt;ls file.txt name.txt public platform providers www </code></pre> <p>However, checking git status says nothing has changed.</p> <p>I discovered that 'git reset --hard' fixes public back.</p> <p>CLUE: It seems that this only happens after making a new commit to master. Does git do some kind of automatic merge?</p> <p>After 'git reset --hard', the checkout to master and back to public work fine, even if repeatedly.</p> <p>The first, I thought it was fixed but it occurred again the next time I made a change. Let me try that one more time now to make sure...</p> <p>Now, I can't reproduce it. But it did happen twice.</p> <p>One other CLUE is that the first time I did a git reset --hard it complained about files being locked by processes.</p> <p>After the offending programs were closed, the git reset --hard succeeded and then the checkout worked between the two branches.</p> <p>So does the checkout get confused by files being locked and "silently" fail? It would be better, it that's the problem to fail the same way git reset --hard does than just reporting success and having a jumbled workspace.</p> <p>Any other wisdom or options to set on git checkout to avoid this will be appreciated.</p> <p>Wayne</p>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. This table or related slice is empty.
    1. USWayne
    plurals
    1. This table or related slice is empty.
    1. PL
      singulars
      1. LTLinked
    1. This table or related slice is empty.
    1. PO
      singulars
      1. PTAnswer
    2. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POgit checkout remote branch shows extraneous files?
      1. USdsummersl
      1. VTFavorite
    1. COOkay, now found the problem. How to fix? Problem is that there are ignored files in subfolders. git properly does the checkout but leaves all the ignored files and if there several directories down, it leaves all the directies to get to them. I tried git clean -f and it still leaves the files. How to clean out non-tracked files when switching between branches?
      singulars
      1. POgit checkout remote branch shows extraneous files?
      1. USWayne
 

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