[ixpmanager] Issues Running updates

[Barry O'Donovan]

Just run:

git checkout -- bower.json

 - Barry

Levi Pederson wrote:
> All,
> 
> I'm following the process here.  
> 
> http://docs.ixpmanager.org/install/upgrading/
> 
> And I've received an error saying, I've modified the bower.json file.  
> A file that I am unaware that I changed.  
> 
> git pull
> Updating aa14e99..b3528d0
> error: Your local changes to the following files would be overwritten by
> merge:
>         bower.json
> Please, commit your changes or stash them before you can merge.
> Aborting
> 
> Does anyone have a recommendation?
> 
> My install was based on the V4 script several months ago.
> 
> Thank you in advance,
> 
> *Levi Pederson*
> Mankato Networks LLC
> cell | 612.481.0769
> work | 612.787.7392
> levipederson at mankatonetworks.net <mailto:levipederson at mankatonetworks.net>
> 
> _______________________________________________
> INEX IXP Manager mailing list
> ixpmanager at inex.ie
> https://www.inex.ie/mailman/listinfo/ixpmanager

-- 

Kind regards,
Barry O'Donovan
INEX Operations

https://www.inex.ie/support/
+353 1 531 3339