##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)
| #!/usr/bin/env bash | |
| # script: watch | |
| # author: Mike Smullin <[email protected]> | |
| # license: GPLv3 | |
| # description: | |
| # watches the given path for changes | |
| # and executes a given command when changes occur | |
| # usage: | |
| # watch <path> <cmd...> | |
| # |
| # -*- coding: utf-8 -*- | |
| """Add permissions for proxy model. | |
| This is needed because of the bug https://code.djangoproject.com/ticket/11154 | |
| in Django (as of 1.6, it's not fixed). | |
| When a permission is created for a proxy model, it actually creates if for it's | |
| base model app_label (eg: for "article" instead of "about", for the About proxy | |
| model). |
(by @andrestaltz)
If you prefer to watch video tutorials with live-coding, then check out this series I recorded with the same contents as in this article: Egghead.io - Introduction to Reactive Programming.
By: @BTroncone
Also check out my lesson @ngrx/store in 10 minutes on egghead.io!
Update: Non-middleware examples have been updated to ngrx/store v2. More coming soon!
Table of Contents
