Arjun Ray ArjunRayGA

A method for using git to pull changes from our master repo without merge conflicts

example below is for Jupyter Notebooks but it works for any type of file. Use "theirs" keyword instead of "ours" if you want to keep remote version of file on merge conflict

You must first navigate to the root directory of your local repo copy in your terminal
if git remote -v doesn’t show remotes with an address https://github.com/ga-students/DS-BOS-19.git, run

git remote add dat-origin https://github.com/ga-students/DS-BOS-19.git

HOW TO INSTALL PYTHON 2.7 ON AN ANACONDA BUILD FOR PYTHON 3

the reverse also works for installing python 2 on a python 3 build

on Windows, these commands will need to all be run from Anaconda CLI

So, we’re going to use a command line tool that comes with Anaconda called conda. conda allows us to create new virtual environments; basically different independent sandboxes with different version of python installed in them. We will use conda to install python 2.7 along with all of the nice 2,7-compatible python packages that anaconda installs. Then we will "activate" that environment ("activation" simply switches between environments), so that it becomes available from within programs installed by anaconda, namely Jupyter Notebook.

1) install python 2.7 within conda

run the following commands in your terminal

Hello

Subheader

title

bold?

nothing?

here's some text

HI	My	Name	Is

	#!/usr/bin/env python
	# -- coding: utf-8 --

	import os
	from time import sleep

	cake = '''
	* *
	*
	*

	# company-culture.md
	✔️ Don’t use the word addicted

	# consultant-tools.md
	✔️ Add short description

	# github.md
	✔️ Add short description

	# slack.md

	#!/usr/bin/env python
	'''
	SHA FILE/TREE COMPARATOR

	takes two args:
	file/dir string 1
	file/dir string 2

	compares all files in both locations for SHA checksum matches.
	// Only verified working on Darwin Kernel Version 17.3.0 //

	"allows indentation and syntax highlighting
	"filetype plugin indent on
	"syntax enable

	set mouse=a

	set ambiwidth=double
	imap jk <Esc>
	set belloff=all

	function atom_teach_resize() {
	# function that toggles Atom font sizes from default to teaching(large) for
	# better text visibility on large screens/projectors.
	# copy me into .bashrc or .bash_profile to use from command line.
	#
	# arg1 values:
	# "off" : font size -> atom default
	# "[int](px\|em\|%)" : font size -> arg1
	# none : font size -> default teaching size (FONT_SIZE)
	#