RenzoTejada/Git Merge with Meld

Created April 19, 2016 16:12

Star () You must be signed in to star a gist
Fork () You must be signed in to fork a gist

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/RenzoTejada/7fc221d4db127977939d447a80aaf49b.js"></script>
Save RenzoTejada/7fc221d4db127977939d447a80aaf49b to your computer and use it in GitHub Desktop.

Download ZIP

instalar meld para solucionar conflictos de merge en git

Raw

Git Merge with Meld

	1. Instalar meld
	sudo apt-get install meld
	2. Configurar git:
	git config --global merge.tool meld
	3. Cuando tengas conflictos:
	git mergetool

carlosrjg7 commented May 20, 2019

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