User tests: Successful: Unsuccessful:
This will add a parameter to use (or not) a CDN.
Currently this is only applied to a font which is loaded from Google.
This change is useful for local off line (or paid mobile) development :sad:
Hmm that's bad.
So every time we make changes to the vagrant config file, devs have to stash/unstash their local vagrant config file.
Not sure what we could possibly do about that...
I can't understand is it a bug with the git or not... I will try to download all repo one more time and see how it goes.
On new repo it is the same. You do not have such problem. don't you?
P.S.
Will try to update my Git to the latest version, may be will help.
Status | New | ⇒ | Closed |
Closed_Date | 0000-00-00 00:00:00 | ⇒ | 2014-07-24 18:34:35 |
On new repo it is the same.
That's really odd. Not sure why you get an error for local changes on a clean repo.
You do not have such problem. don't you?
No, I don't. But i have to confess that I don't use the Vagrant box that much, so bug reports are welcome
Will try to update my Git to the latest version, may be will help.
Did that help?
Nope, nothing helps and I am angry I can't even pull master :(
Dimus@DIMUSNOTE /d/repos/jissues (master)
$ git st
On branch master
Your branch is behind 'origin/master' by 18 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
nothing to commit, working directory clean
Dimus@DIMUSNOTE /d/repos/jissues (master)
$ git pull origin master
From github.com:joomla/jissues
* branch master -> FETCH_HEAD
Updating 1a059bb..72f1959
error: Your local changes to the following files would be overwritten by merge:
etc/config.vagrant.json
Please, commit your changes or stash them before you can merge.
Aborting
Dimus@DIMUSNOTE /d/repos/jissues (master)
Seems that I figured out - deleted config.vagrant.json
, then created it and added to version control. After that I did git update-index --assume-unchanged etc/config.vagrant.json
and now I do not have any errors
Seems like some git internals we don't understand... Glad you got it working
Trying to test, but cannot checkout :(
I did
git update-index --assume-unchanged etc/config.vagrant.json
earlier and worked without problems and suddenly this started to happen :(