- Scott Chacon on the Interwebs(リンク切れ)
- Scott Chacon on the Interwebs
- GitHub Flow - The best way to use Git and GitHub
31 Aug 2011
>>> a = range(10) | |
>>> import itertools | |
>>> b, c = itertools.tee(a) | |
>>> a2 = iter(a) | |
>>> b, c = itertools.tee(a2) | |
>>> next(b) | |
0 | |
>>> next(b) | |
1 | |
>>> next(b) |
$ python | |
Python 2.7.2 (default, Jun 12 2011, 15:08:59) [MSC v.1500 32 bit (Intel)] on win32 | |
Type "help", "copyright", "credits" or "license" for more information. | |
>>> int | |
<type 'int'> | |
>>> type(10) | |
<type 'int'> | |
>>> dir(10) | |
['__abs__', '__add__', '__and__', '__class__', '__cmp__', '__coerce__', '__delattr__', |
##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)
function git_checkout_match_generator(text, first, last) | |
found_matches = false; | |
if rl_state.line_buffer:find("^git checkout ") then | |
has_start_branch = not rl_state.line_buffer:find("^git checkout[ ]*$") | |
for line in io.popen("git branch 2>nul"):lines() do | |
local m = line:match("[%* ] (.+)$") | |
if m then | |
if not has_start_branch then | |
clink.add_match(m) |
A list of interesting GH repos:
let mapleader="," | |
set surround | |
set easymotion | |
set multiple-cursors | |
set ignorecase | |
set smartcase | |
"set selection=exclusive | |
" https://youtrack.jetbrains.com/issue/VIM-765#comment=27-4264908 |
--- Actions --- | |
$Copy <M-C> | |
$Cut <M-X> <S-Del> | |
$Delete <Del> <BS> <M-BS> | |
$LRU | |
$Paste <M-V> | |
$Redo <M-S-Z> <A-S-BS> | |
$SearchWeb <A-S-G> | |
$SelectAll <M-A> | |
$Undo <M-Z> |
This is the follow up to a post I wrote recently called From Require.js to Webpack - Party 1 (the why) which was published in my personal blog.
In that post I talked about 3 main reasons for moving from require.js to webpack:
Here I'll instead talk about some of the technical challenges that we faced during the migration. Despite the clear benefits in developer experience (DX) the setup was fairly difficult and I'd like to cover some of the challanges we faced to make the transition a bit easier.