Code Monkey home page Code Monkey logo

Comments (12)

tomjn avatar tomjn commented on June 12, 2024 1

which branch are you on and what does VVV's splash screen show? git status output should help here, also git remote -v might reveal something off

from vvv.

irishetcher avatar irishetcher commented on June 12, 2024 1

Hi Tom,

Thanks for the quick response.

The splash screen says the following:

v3.12 Ruby:2.6.6, Path:"/Users/stvaughan/vagrant-local"
_/_/_/ git::stable(aee9a69)

Platform: darwin19.2.0 shell:/bin/zsh vagrant-hostsupdater vagrant-goodhosts shared_db_folder_disabled
Vagrant: v2.2.10, virtualbox: v6.1.50

From the two commands you suggested I got the following:

git status
On branch stable
Your branch is up to date with 'origin/stable'.

Changes not staged for commit:
(use "git add ..." to update what will be committed)
(use "git restore ..." to discard changes in working directory)
modified: Vagrantfile

Untracked files:
(use "git add ..." to include in what will be committed)
ACF
Pic to Upload/
TTricks
VAGRANT UPDATE

no changes added to commit (use "git add" and/or "git commit -a")

On the above ACF and TTricks are two of the test WordPress sites I have installed. They are also two aliases I have at the top of the install so mayne this is what is referred to here.

Pic to Upload is just a folder of pictures for uploading to the TTrick site. Its at the top level of the install as well.

VAGRANT UPDATE is the one I don't seem to be able to identify.

AND

git remote -v
origin https://github.com/Varying-Vagrant-Vagrants/VVV.git (fetch)
origin https://github.com/Varying-Vagrant-Vagrants/VVV.git (push)

GitHub
An open source Vagrant configuration for developing with WordPress - Varying-Vagrant-Vagrants/VVV

from vvv.

tomjn avatar tomjn commented on June 12, 2024

Yup this explains it:

Changes not staged for commit:
(use "git add ..." to update what will be committed)
(use "git restore ..." to discard changes in working directory)
modified: Vagrantfile

git diff will tell you what modifications you made but as long as there are changes you can't pull down the newer commits with newer versions of VVV

from vvv.

irishetcher avatar irishetcher commented on June 12, 2024

Thanks Tom,
I'll have a go at that.

from vvv.

tomjn avatar tomjn commented on June 12, 2024

@irishetcher did you get it updated in the end?

from vvv.

irishetcher avatar irishetcher commented on June 12, 2024

Hi Tom,

It still keeps installing to the same version. But, I do notice that I am actually on v3.12 not the Vagrant version v2.2.10 as I first reported by mistakes. So maybe that's where I should be anyway?

I managed to deal with the VAGRANT UPDATE file. That file has theses instructions to update?

VAGRANT UPDATE

# If you need a fresh start it's probably sensible to make sure you are on the stable branch
git checkout master
# Make sure this is the latest VVV
git pull
# Turn the machine on (so destroy can run its cleanup)
vagrant up
# Destroy the machine
vagrant destroy
# Make sure we use the latest version of the base box
vagrant box update
# Make sure the recommended vagrant plugins are installed
vagrant plugin install vagrant-hostsupdater
# And that they're all up to date
vagrant plugin update
# Start VVV and create the VM from scratch
vagrant up --provision

By any chance are these the instructions to update? There are so many versions of update around, it's always hard to guage which one to use.

git status is also saying that the directory I have placed in the top level (Pic to Upload) is untracked I followed the instructions to git add but then it wants me to push it. Not sure, if this is something that is pushed somewhere, where that somewhere is. If I try to move that directory out and run git status agian I get a list of warnings so I just followed the instructions to restore. git restore --staged Pic\ to\ Upload

Appologies if my explanation is vague. The command line is not something I use everyday.

What I have works for some local work. I have started using Local by Flywheel as well so for what I need this might suffice.

from vvv.

tomjn avatar tomjn commented on June 12, 2024

By any chance are these the instructions to update? There are so many versions of update around, it's always hard to guage which one to use.

I don't know where you got those instructions from, they look out of date, but all update instructions assume you have a clean git checkout, if git considers your checkout unclean with changes that haven't been committed then nothing past git pull can be done until that is resolved. Until git status says you have no untracked changes, and git pull works fine, the other steps are meaningless

To be clear, the issues you've had so far aren't specific to VVV, they're generic git problems

from vvv.

tomjn avatar tomjn commented on June 12, 2024

These are the current instructions: https://varyingvagrantvagrants.org/docs/en-US/installation/keeping-up-to-date/

VVV
Update VVV from time to time to keep pace with new fixes and improvements.

from vvv.

irishetcher avatar irishetcher commented on June 12, 2024

I think trying git pull may be my issue here. I think it must have been installed from the download originally. Is there any way I can hook up to the git repository for this.

I just tried a manual install, but tricky trying to figure out what not to overrite. I made a mess but managed to rcover with a backup of the original directory.

from vvv.

tomjn avatar tomjn commented on June 12, 2024

You splash screen and git status output indicate that you're on the stable branch, an ls -al should reveal a .git folder.

git diff should show you what the untracked/uncommitted change is that git is trying to avoid destroying, I don't know what the change is but if you've ever modified that file to add a shared folder, enable public networking etc then that'll prevent updates from being pulled via git

from vvv.

tomjn avatar tomjn commented on June 12, 2024

This might be helpful: https://stackoverflow.com/questions/52704/how-do-i-discard-unstaged-changes-in-git#52713

Stack Overflow
How do I discard changes in my working copy that are not in the index?

from vvv.

tomjn avatar tomjn commented on June 12, 2024

A git stash might also help

from vvv.

Related Issues (20)

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.