Skip to content

Instantly share code, notes, and snippets.

Mark Biggers biggers

Block or report user

Report or block biggers

Hide content and notifications from this user.

Learn more about blocking users

Contact Support about this user’s behavior.

Learn more about reporting abuse

Report abuse
View GitHub Profile
View gist:9607312

Reference: http://stackoverflow.com/a/11593308

I have two branches A and B and, I want to merge branch A's single file with Branch B's corresponding file. How can I do that?

I have two branches A [master] and B with the same files but a different programming interface in some files. Now the methods of file f, which is independent of the interface differences in the two branches, were changed in branch B, but the change is important for both branches. Thus, I need to merge just file f of branch B into file f of branch

View fabfile.py
from fabric.api import *
from fabric.context_managers import cd
from fabric.operations import local as lrun, sudo
from fabric.contrib.files import sed
from fabric.utils import warn
from local_fabfile import root, prod, lh, SERVER_IP
def virtualenv(command, run_directory=''):
if run_directory == '':
@biggers
biggers / vbox_clom_trial.py
Last active Dec 22, 2015
Am example (expanded) of using Python 'clom' library, to "abstract" Virtualbox command-line. Thanks to the "Refs!" It's not a runnable script by itself; will probably make it so, soon.
View vbox_clom_trial.py
#!/usr/bin/env python
from clom import clom
from pprint import pprint as pp
# Install, into a virtualenv: pip install clom
#
# Reference:
# http://clom.readthedocs.org/en/latest/
# Derived from:
@biggers
biggers / sh_mod_vbox.py
Last active Dec 22, 2015
Python 'sh' module example, working with Virtualbox commands & outputs
View sh_mod_vbox.py
#!/usr/bin/env python
from __future__ import print_function
from pprint import pprint
# install into a virtual-env: pip install sh
#
# References:
# http://amoffat.github.com/sh
#
# Inspired by:
View fabfile.py
#!/usr/bin/python
# encoding: utf-8
from __future__ import with_statement
import os
import sys
import datetime
from fabric.api import cd, run, prefix, task, env, get, roles
from fabric.colors import yellow, green
from contextlib import contextmanager as _contextmanager
@biggers
biggers / x11vnc.sh
Created Aug 19, 2016
x11vnc service start-up script
View x11vnc.sh
#!/bin/sh
VNC_SERVER=/usr/bin/x11vnc
VNC_DISPLAY=:0
LOG_FILE=/tmp/x11vnc-run.log
case "$1" in
start|restart)
killall ${VNC_SERVER}
@biggers
biggers / network_mgr_wired_mgmt_recipe.sh
Created Jan 18, 2017
Enable wired-interfaces (incl VPN) to be managed by systemd - Ubuntu Linux 16+
View network_mgr_wired_mgmt_recipe.sh
# NetworkManager should manage wired interfaces!
# Linux Mint 18.x (Ubuntu 16.04)
# REF: "fixing VPN problem in Ubuntu",
# http://blog.wensheng.org/search?updated-min=2015-01-01T00:00:00-06:00&updated-max=2016-01-01T00:00:00-06:00&max-results=5
aptitude install etckeeper
git log
nmcli c # NOTE: no wired-interface controlled
emacs -nw /etc/NetworkManager/NetworkManager.conf
@biggers
biggers / ansible-tagged-install.sh
Last active Jan 18, 2017
Installing Ansible from 'git source' -- by tagged-release
View ansible-tagged-install.sh
## better, working "shell-recipe" for installing a tagged
## Ansible release, from Git source
## https://github.com/ansible/ansible/tags
sudo aptitude install python-yaml python-jinja2 python-paramiko
cd ~/git/Python
tag_name='v1.9.4-1'
git clone git://github.com/ansible/ansible.git --recursive
@biggers
biggers / Makefile.docker
Created Mar 22, 2016
GNU Makefile for docker-compose work
View Makefile.docker
## -*- makefile -*-
## biggers@utsl.com, Mark Biggers
## GNU Makefile for docker-compose build & run of a Python or other Project
##
## REFs:
## https://docs.docker.com/compose/reference/
## https://github.com/docker/compose/releases
##
@biggers
biggers / opennebula-suse-install.rst
Created Oct 31, 2013
OpenNebula: openSUSE first-cut Deployment -- document
View opennebula-suse-install.rst

OpenNebula: openSUSE first-cut Deployment

Author: Mark Biggers <mbiggers@ine.com
Description:Install & configuration of OpenNebula (ONE) 4.x on openSUSE 12.3
Ref:SDB:Cloud OpenNebula: <http://en.opensuse.org/SDB:Cloud_OpenNebula>
Ref:ONE Installing the Software: <http://opennebula.org/documentation:rel4.2:ignc#opensuse_platform_notes>
Ref:KVM driver, KVM configuration: <http://opennebula.org/documentation:archives:rel4.0:kvmg#kvm_configuration>
Ref:ONE Rel 4.2 packages, for openSUSE: <http://download.opensuse.org/repositories/Cloud:/OpenNebula:/Testing/openSUSE_12.3/>
You can’t perform that action at this time.