Quantcast
Channel: Installing and upgrading help
Viewing all articles
Browse latest Browse all 47352

git pull fails

$
0
0
by Dani Kaplan.  

I'm trying to update from 2.7 to 2.8

when calling git pull I get this error:

[root@vmi10324 public_html]# git pull

Updating 2aa6dd4..cfab858

error: Your local changes to the following files would be overwritten by merge:

        admin/auth_config.php

.....


and the pull is aborted. 

What am I missing ?

Thanks ,

Dani



Viewing all articles
Browse latest Browse all 47352

Trending Articles



<script src="https://jsc.adskeeper.com/r/s/rssing.com.1596347.js" async> </script>