##git mergetool
In the middle file (future merged file), you can navigate between conflicts with ]c and [c.
Choose which version you want to keep with :diffget //2 or :diffget //3 (the //2 and //3 are unique identifiers for the target/master copy and the merge/branch copy file names).
:diffupdate (to remove leftover spacing issues)
:only (once you’re done reviewing all conflicts, this shows only the middle/merged file)
| Mainly for php developers trying to make sense of ruby syntax | |
| 1. def send_message ------> public function sendMessage | |
| 2. begin rescue end ---> try catch | |
| 3. to_s ---> to string | |
| 4. $! ---> get_last_error() | |
| 5. self.save! ---> just a convention notifying side effect | |
| 6. user.is_admin? --> convention notifying it returns a boolean | |
| 7. user.send_message ---> $user.sendMessage() - no need for () if there are no parameters | |
| 8. self.account_id ---> $this->account_id |
| Sublime | |
| sequel pro | |
| sqldeveloper | |
| zshell | |
| iterm | |
| skitch | |
| sourcetree | |
| virtualbox | |
| vagrant | |
| slack |
| blueprint process flow diagrams | |
| visual diagram | |
| confluence | |
| dyna trace / newrelic / app dynamic | |
| gomez | |
| soasta | |
| sococo | |
| tea leaf |