This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#include <string> | |
#include <unordered_map> | |
using namespace std; | |
// I've left the types explicit for clarity, but in real code | |
// I'd probably use `auto` | |
// The settings object is a hash table of keys and values. Everythings strings, | |
// no fighting the type system, no 3rd party libraries, everything is C++ 101. | |
const unordered_map<string, string> userSettings = parseSettings("path/to/settings.ini"); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
git checkout <feature-branch> | |
git pull | |
git checkout <release-branch> | |
git pull | |
git merge --no-ff <feature-branch> | |
git push | |
git tag -a branch-<feature-branch> -m "Merge <feature-branch> into <release-branch>" | |
git push origin branch-<feature-branch> | |
git branch -d <feature-branch> | |
git push origin :<feature-branch> |
NewerOlder