How To Undo A Conflicting Merge in GIT

Author: , June 8th, 2021

shell> git merge branch-with-messy-changes

shell> git status

shell> git merge –abort shell> git status

IMPORTANT NOTE: Previous versions of git used different commands for this operation: Latest version: git merge –abort Older than version 1.7.4: git reset –merge Older than version 1.6.2: git reset –hard

How To Revert a Merge in GIT

Author: , November 19th, 2020

How To Revert the Last git Commit

Author: , July 9th, 2020

shell$ git log | head -1 commit a203e1bd04718bff10a3df4a3389c493c97c0432 Use the commit string as the last argument to the git revert command: shell$ git revert -m 1 a203e1bd04718bff10a3df4a3389c493c97c0432

How To Merge Object Variables in PHP

Author: , June 11th, 2020

$merged_object = (object) array_merge((array) $object1, (array) $object2);

How To Compare Two Lists Using grep

Author: , August 1st, 2016

Output all lines in list.txt which don’t match any line in excluded.txt: grep -Fxv -f excluded.txt list.txt