Wednesday, March 16, 2016

Git basiscs : how to keep your feature branch in sync with master

Three cool threads:



http://stackoverflow.com/questions/5601931/best-and-safest-way-to-merge-a-git-branch-into-master

https://help.github.com/articles/resolving-a-merge-conflict-from-the-command-line/


http://stackoverflow.com/questions/16329776/git-howto-keep-a-branch-in-sync-with-master


No comments:

Post a Comment

Ubuntu 12.04, 14.04, 16.04 - auto start an app or script before login

To run a command or application at startup, even before the user has logged in, you can use this file: /etc/rc.local The commands entered...