replaced understanding-conda with version from master.

Author: jyaistMap

guide/01-getting-started/understanding-conda.ipynb

@@ -12,22 +12,6 @@
     "* [Miniconda](https://conda.io/miniconda.html) - installs only Python, conda and other libraries needed to run conda\n",
     "> See [Anaconda or Miniconda](https://conda.io/docs/user-guide/install/download.html#anaconda-or-miniconda) for an explanation of differences.\n",
     "\n",
-
-    "This document will cover:\n",
-    "- [The Conda Basics](#The-Conda-Basics)\n",
-    "- [Conda Environments](#Conda-Environments)\n",
-    "  - [The Default Environments](#The-Default-Environments:)\n",
-    "  - [ArcGIS Pro](#ArcGIS-Pro)\n",
-    "    - [Manage conda environments with ArcGIS Pro](#Manage-conda-environments-with-ArcGIS-Pro:)\n",
-    "    - [A Note on upgrading ArcGIS Pro environments](#note-on-upgrading)\n",
-    "  - [Anaconda Distribution](#Anaconda-Distribution)\n",
-    "    - [Manage conda environments with Anaconda](#Manage-conda-environments-with-Anaconda:)\n",
-    "- [Activating Environments](#Activating-Environments)\n",
-    "- [Adding Packages to Environments](#Adding-Packages-to-Environments)\n",
-    "- [Setting up IDEs](#Setting-up-IDEs)\n",
-    "- [Step by Step on macOS: A GIS Environment](#Step-by-Step-on-macOS:-A-GIS-Environment)\n",
-    "\n",
-
     "## The Conda Basics\n",
     "The easiest way to understand conda is by working through the [30-minute Getting Started](https://conda.io/docs/user-guide/getting-started.html) tutorial. The sections below summarize and outline the commands you need to know to work with the ArcGIS API for Python.\n",
     "\n",
@@ -37,11 +21,7 @@
     "## Conda Environments\n",
     "When you create conda environments, you create physical directories that isolate the specific Python interpreter and packages you install into the environment. This allows you to create multiple environments that can have different versions of software, including Python. You can easily create new environments and then switch between them without affecting other environments.  For detailed explanation and instructions, see the conda documentation on [Managing environments](https://conda.io/docs/user-guide/tasks/manage-environments.html).\n",
     "\n",
-<<<<<<< HEAD
     "Let's explore what is available directly after installing conda through either [ArcGIS Pro](#ArcGIS-Pro) or the [Anaconda Distribution](#Anaconda-distribution).\n",
-=======
-    "Let's explore what is available directly after installing conda through either [ArcGIS Pro](#ArcGIS-Pro) or the [Anaconda Distribution](#Anaconda-Distribution).\n",
->>>>>>> upstream/pro-upgrade-no-pin
     "### The Default Environments:\n",
     "Depending upon how you installed the Python API (with ArcGIS Pro or the Anaconda Distribution), you will notice different sets of default environments.\n",
     "\n",
@@ -60,11 +40,7 @@
     "<p></p>\n",
     "* `arcgispro-py3`\n",
     "\n",
-<<<<<<< HEAD
     " This environment contains Python and the arcgispro package, including all the [ArcPy](http://pro.arcgis.com/en/pro-app/arcpy/get-started/what-is-arcpy-.htm) functionality.\n",
-=======
-    " This environment contains Python and the `arcgispro` package, including all the [ArcPy](http://pro.arcgis.com/en/pro-app/arcpy/get-started/what-is-arcpy-.htm) functionality.\n",
->>>>>>> upstream/pro-upgrade-no-pin
     "\n",
     "<h5><strong><em>Manage conda environments with ArcGIS Pro:</em></strong></h5>\n",
     "\n",
@@ -82,20 +58,9 @@
     "* [Windows Command-Line](https://technet.microsoft.com/en-us/library/cc754340)\n",
     " \n",
     " The standard MS-DOS Windows command-line application.\n",
-<<<<<<< HEAD
     " \n",
     "\n",
     "> For additional technical information about conda and ArcGIS Pro, see these articles:\n",
-=======
-    "<a id=\"note-on-upgrading\" style=\"color:black\"></a> \n",
-    "> **NOTE:** Upgrading the ArcGIS API for Python beyond release 1.2.5 in any environment tied to ArcGIS Pro (meaning the default `arcgispro-py3` environment, or any environment containing the `arcgispro` package), **requires** the use of either a Terminal or **Python Command Prompt** with the following command:\n",
-    "```python\n",
-    "   conda upgrade -c esri --no-pin arcgis\n",
-    "```\n",
-    " \n",
-    "\n",
-    "For additional technical information about conda and ArcGIS Pro, see these articles:\n",
->>>>>>> upstream/pro-upgrade-no-pin
     "\n",
     "  * [Python and ArcGIS Pro 1.3: Conda](https://community.esri.com/docs/DOC-8359)\n",
     "  * [Conda and ArcGIS Pro 1.4](https://arcpy.wordpress.com/2016/10/21/conda-and-arcgis-pro/)\n",
@@ -195,15 +160,9 @@
  "metadata": {
   "anaconda-cloud": {},
   "kernelspec": {
-<<<<<<< HEAD
    "display_name": "Python [conda env:arcgis-pyapi]",
    "language": "python",
    "name": "conda-env-arcgis-pyapi-py"
-=======
-   "display_name": "Python 3",
-   "language": "python",
-   "name": "python3"
->>>>>>> upstream/pro-upgrade-no-pin
   },
   "language_info": {
    "codemirror_mode": {
@@ -215,11 +174,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-<<<<<<< HEAD
    "version": "3.5.3"
-=======
-   "version": "3.6.3"
->>>>>>> upstream/pro-upgrade-no-pin
   },
   "varInspector": {
    "cols": {