##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)
| /* | |
| Steps to unfollow: | |
| ------------------ | |
| 1. Load all of your twitter followers by scrolling down. | |
| 2. Run the below "Minified Version" of "unfollow.js" in browser's console. | |
| */ | |
| // Minified Version | |
| $(".user-actions-follow-button.js-follow-btn.follow-button.btn").each(function(){$(this).click();}); |
Open Terminal. Type javac -version and check your current JDK version. If you seem to have javac 1.7.* JDK version, you can skip this section.
Termianl.sudo apt-get install openjdk-7-jdk.
| /** | |
| * Basic example to pass values between parent and child components in React | |
| * Seems to be in line with this | |
| * http://stackoverflow.com/questions/24147331/react-the-right-way-to-pass-form-element-state-to-sibling-parent-elements | |
| * Now I have the state in parent and child. Is that good or bad? Why would I need it in child? | |
| * Could probably take that out | |
| * */ | |
| class Parent extends React.Component { | |
| constructor(props) { | |
| super(props); |
In this gist we are going to learn about basic goodies that we get from the library lodash/fp (fp stands for functional programming, great for ensuring immutability).We'll learn just by doing (step by step guided sample + codepens).
We'll cover lodash set and flow functions