##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)
| Generously taken from this discussion; https://github.com/dnschneid/crouton/issues/675 | |
| They've created a wiki: https://github.com/dnschneid/crouton/wiki/Repack-kernel-to-Enable-VT_x-for-Virtualbox | |
| You should check it out to see if anything has changed. | |
| A. first of all install virtualbox correctly: https://gist.github.com/komuW/10991598. then; | |
| 1.Open a shell on your Chrome OS | |
| ie while in in chromeOS; open browser, then ctrl+alt+T, then type shell, then press enter | |
| 2.Disable verified boot : |
Requirement: Chromebook, Common Sense, Commandline Ablity, 1 hour of time
Dear developers with a spare Chromebook lets inject a little personalization into your Crosh shell with custom fonts, the solarized theme, and extra secure shell options.
Also, keep in mind that the terms Chrosh, Chrosh Window, and Secure Shell all refer to various versions and extentions built around the ChromeOS terminal. Settings that affect the ChromeOS terminal are global.
| file_to_disk = './tmp/large_disk.vdi' | |
| Vagrant::Config.run do |config| | |
| config.vm.box = 'base' | |
| config.vm.customize ['createhd', '--filename', file_to_disk, '--size', 500 * 1024] | |
| config.vm.customize ['storageattach', :id, '--storagectl', 'SATA Controller', '--port', 1, '--device', 0, '--type', 'hdd', '--medium', file_to_disk] | |
| end |
| // Implementation of a UDP proxy | |
| package main | |
| import ( | |
| "flag" | |
| "fmt" | |
| "log" | |
| "net" | |
| "os" |
| # Problem: | |
| # | |
| # If you use git submodules linking two private github repos, you'll need to create a separate deploy key for each. | |
| # Multiple keys are not supported by Ansible, nor does ansible (when running git module) resort to your `.ssh/config` file. | |
| # This means your ansible playbook will hang in this case. | |
| # | |
| # You can however use the ansible git module to checkout your repo in multiple steps, like this: | |
| # | |
| - hosts: webserver | |
| vars: |
| package main | |
| import ( | |
| "bytes" | |
| "exec" | |
| "log" | |
| "os" | |
| ) | |
| // Pipeline strings together the given exec.Cmd commands in a similar fashion |
| " Author: Bernardo Fontes <falecomigo@bernardofontes.net> | |
| " Website: http://www.bernardofontes.net | |
| " This code is based on this one: http://www.cmdln.org/wp-content/uploads/2008/10/python_ipdb.vim | |
| " I worked with refactoring and it simplifies a lot the remove breakpoint feature. | |
| " To use this feature, you just need to copy and paste the content of this file at your .vimrc file! Enjoy! | |
| python << EOF | |
| import vim | |
| import re | |
| ipdb_breakpoint = 'import ipdb; ipdb.set_trace()' |
Find it here: https://github.com/bitemyapp/learnhaskell