Skip to content

Instantly share code, notes, and snippets.

@RenzoTejada
Created April 19, 2016 16:12
Show Gist options
  • Save RenzoTejada/7fc221d4db127977939d447a80aaf49b to your computer and use it in GitHub Desktop.
Save RenzoTejada/7fc221d4db127977939d447a80aaf49b to your computer and use it in GitHub Desktop.
instalar meld para solucionar conflictos de merge en git
1. Instalar meld
sudo apt-get install meld
2. Configurar git:
git config --global merge.tool meld
3. Cuando tengas conflictos:
git mergetool
@carlosrjg7
Copy link

sudo docker ps
sudo docker exec -it eb836c5ffafd bash
root@eb836c5ffafd:/var/www/html# php bin/magento
root@eb836c5ffafd:/var/www/html# php bin/magento indexer:reindex
root@eb836c5ffafd:/var/www/html# php bin/magento cache:flush

@carlosrjg7
Copy link

deploy magento varios idiomas
bin/magento setup:static-content:deploy en_US es_PE -f

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment