Author: josmx

How to set up free merge and diff tool (p4merge) for GIT

This is just a backup of this article as I found it very handy: Install p4merge from Add below to your .gitconfig [merge] keepBackup = false tool = p4merge [mergetool “p4merge”] cmd = /Applications/ “\”$PWD/$BASE\”” “\”$PWD/$REMOTE\”” “\”$PWD/$LOCAL\”” “\”$PWD/$MERGED\”” keepTemporaries = false trustExitCode = false keepBackup = false [diff] tool = p4merge [difftool “p4merge”]…

Read the full article

Adding a command Alias to git

Imagine you wan to run: git log –all –graph –decorate –oneline But you don’t wan t to write all that each time but instead something shorter like “logh” Well you can add a “git alias” in this way: git config –global alias.logh “log –all –graph –decorate –oneline” Voila, go and try it out! just do…

Read the full article

Git quick-start basics

Hi there you are reading my Git notes for a basic quickstart Git demo flow, I intend to cleanup in the future but in the meantime feel free to look-around and let me know if you have any doubts. Git starts with the branch “Master” by default (when you create a new repository) Git has…

Read the full article

UnsatisfiableError: The following specifications were found to be in conflict: keras pil

>conda install -c anaconda pil Solving environment: failed UnsatisfiableError: The following specifications were found to be in conflict: – keras – pil Use “conda info <package>” to see the dependencies for each package.   Workaround: conda install pillow “Pillow is the “friendly PIL fork” by Alex Clark and Contributors. PIL is the Python Imaging Library by…

Read the full article setup and dataset dir

Downloaded dataset from here: And to use it modified: X:\Anaconda3\envs\ENV_NAME\Lib\site-packages\keras\datasets #dirname = ‘cifar-10-batches-py’ dirname = ‘X:\Anaconda3\envs\ENV_NAME\Lib\site-packages\keras\datasets\cifar-10-batches-py’

How to install Tensorflow in an Anaconda virtual environment – Mac

So I have Anaconda installed and wanted to install TensorFlow as well (I’m using PyCharm): I tried installing TensorFlow with Conda as per official doc: conda create -n tensorflow pip python=3.6 source activate tensorflow pip install –ignore-installed –upgrade However when creating a new virtual environment in PyCharm you need to make sure TensorFlow…

Read the full article

How to add you xcode project to github

So you created a brand new xcode project and selected a local repository and are wondering how to add it to github? Fear not, below steps to make it happen: Summary: Navigate to the path of your xcode project and run: git remote add foodTracker Pull the changes Git will complain of “fatal: refusing…

Read the full article