Install command line tools:
then run this:
git config --global diff.tool bc3
git config --global difftool.bc3 trustExitCode true
git config --global merge.tool bc3
So you've cloned somebody's repo from github, but now you want to fork it and contribute back. Never fear! | |
Technically, when you fork "origin" should be your fork and "upstream" should be the project you forked; however, if you're willing to break this convention then it's easy. | |
* Off the top of my head * | |
1. Fork their repo on Github | |
2. In your local, add a new remote to your fork; then fetch it, and push your changes up to it | |
git remote add my-fork git@github...my-fork.git |
NOTE: This should be an ever changing document that is kept up to the date with the teams standard.
{"lastUpload":"2018-08-25T03:43:26.757Z","extensionVersion":"v3.0.0"} |
[ | |
{ "key": "capslock", "command": "extension.vim_escape" }, | |
{ | |
"key": "ctrl+j", | |
"command": "workbench.action.terminal.toggleTerminal" | |
}, | |
{ | |
"key": "ctrl+`", | |
"command": "workbench.action.focusActiveEditorGroup", | |
"when": "terminalFocus" |
def diff_ids_update(new, existing) do | |
# Use MapSets to find differences in new ids vs current/existing ids. This really could be used for any many to many ids table. | |
new = new |> MapSet.new() | |
existing = existing |> MapSet.new() | |
remove = MapSet.difference(existing, new) |> MapSet.to_list() | |
add = MapSet.difference(new, existing) |> MapSet.to_list() | |
{remove, add} | |
end |
defmodule FinalValue do | |
def fibonacci(number) do | |
[value | _tail] = fibonacci_do(number) | |
value | |
end | |
def fibonacci_do(1), do: [0] | |
def fibonacci_do(2), do: [1 | fibonacci_do(1)] | |
def fibonacci_do(number) when number > 2 do |