This file contains 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
<?xml version="1.0" encoding="UTF-8"?> | |
<project version="4"> | |
<component name="accountSettings"> | |
<option name="activeProfile" value="profile:dev" /> | |
<option name="activeRegion" value="us-west-2" /> | |
<option name="recentlyUsedProfiles"> | |
<list> | |
<option value="profile:dev" /> | |
</list> | |
</option> |
This file contains 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 merge: | |
git checkout master | |
git pull origin master | |
git merge <branch> | |
git push origin master | |
GIT delete branches: | |
Remote then local | |
git push -d origin <branch_name> | |
git branch -d <branch_name> |