DiffMerge merging tool: Installation and configuration for DiffMerge using GIT 1- Download and install your version from: https://sourcegear.com/diffmerge/ 2- run these commands on the terminal
git config --global merge.tool diffmerge
git config --global mergetool.diffmerge.cmd "sgdm --merge --result=\$MERGED \$LOCAL \$BASE \$REMOTE"
git config --global mergetool.diffmerge.trustExitCode true
git config --global mergetool.keepBackup false
git config --global diff.tool diffmerge
git config --global difftool.diffmerge.cmd "sgdm \$LOCAL \$REMOTE"
Handle just with the: “~/.gitconfig” Git offers a range of difftools pre-configuredRead more…
http://www.unheap.com http://plugins.jquery.com http://www.jsdb.io http://microjs.com http://www.jqueryrain.com Do I missing something? Yes, for sure!. Please send me your links to: email@example.com
It is not the strongest of the species that survives, nor the most intelligent, but the one most “RWD” to change. -=- The workflow: RWD can change your mind. We will start with a workflow, this workflow must be createdRead more…
The number of devices connected to the web is out of control. Sometimes companies don’t get the real view of the problem: Everything is “connected” or it will be. Everyone gets connected and If you don’t have your website enabledRead more…
The Front-end development: I used to be a back-end developer working with Java and PHP last 10 years (I still remember that boring purple color from PHP website), :P. I was looking for something else, something to get exited to do.Read more…
Git Commands Initialize a local Git repository git init Check status git status Add a file to the staging area git add [file-name.txt] Commit changes git commit -m “[commit message]” View changes git log View changes (detailed) git log –summaryRead more…