coliver

This is blatently summarized from here: http://dgmstuart.github.io/blog/2017/04/12/how-to-recover-from-rails-database-schema-conflicts-when-rebasing/

I wanted a more succeinct version available to me.

Don't

• Try to manually merge it

Do

coliver

Tested in VirtualBox 5.0.18

Linux Mint 17 Qiana host

Win10 guest

Ensure the VM boots up, windows update, install guest additions, shut down

• Open VirtualBox

coliver

# I use RubyMine. In the find and replace box:
find: expect\((.*)\)\.to receive\((.*)\)(\.with\(.*\))?.and_return
replace: $1.expects($2).returns(
  
# This does most of the work.

coliver

# Install genymotion
https://www.genymotion.com/

# Install Android SDK

# Download Genymotion-ARM-Translation v1.1
# Google it

# Genymotion: 
# Using Google Nexus 7 - 4.3 - API 18 VM

coliver

# install openjdk
sudo apt-get install openjdk-7-jdk

# download android sdk
http://dl.google.com/android/android-sdk_r24.2-linux.tgz

tar -xvf android-sdk_r24.2-linux.tgz
cd android-sdk-linux/tools

# install all sdk packages

coliver

== Rules ==
 On Infrastructure
 -----------------
 There is one system, not a collection of systems.
 The desired state of the system should be a known quantity.
 The "known quantity" must be machine parseable.
 The actual state of the system must self-correct to the desired state.
 The only authoritative source for the actual state of the system is the system.
 The entire system must be deployable using source media and text files.

coliver

<?xml version="1.0" encoding="UTF-8"?>
<DescribeSecurityGroupsResponse xmlns="http://ec2.amazonaws.com/doc/2012-07-20/">
    <requestId>REDACTED</requestId>
    <securityGroupInfo>
        <item>
            <ownerId>REDACTED</ownerId>
            <groupId>REDACTED</groupId>
            <groupName>REDACTED</groupName>
            <groupDescription>REDACTED</groupDescription>
            <ipPermissions/>