Git Tips
==========

See `Git Tips wiki <https://github.com/bootstraponline/meta/wiki/Simple-Git>`_ for more info.

* https://tareq.co/2012/04/deploying-php-apps-with-git-and-git-submodule/
* https://gitpull.io/
* http://blog.vihan.org/index.php/2016/08/14/resolving-git-accidents-101/
* https://github.com/WebDevStudios/CLI-Cheat-Sheet/blob/master/git-commands.md
* [Amend a commit](https://blog.codeminer42.com/git-basics-adding-more-changes-to-your-last-commit-1629344cb9a8#.nl2inavri)
* [Resolving Git Conflicts](https://easyengine.io/tutorials/git/git-resolve-merge-conflicts/)