From 514aa0f4e59d3e8e87834b435e5e3bae2f96ad89 Mon Sep 17 00:00:00 2001
From: Laura Pacilio <83350965+laurapacilio@users.noreply.github.com>
Date: Fri, 14 Oct 2022 16:14:02 -0400
Subject: [PATCH] Revert "Revert "more content updates for flow""

This reverts commit 58ad930f2d0fcbc8c3a36b60e43cdc9f2771b437.
---
 website/docs/cli/import/index.mdx | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/website/docs/cli/import/index.mdx b/website/docs/cli/import/index.mdx
index ab972d956f..535aa99259 100644
--- a/website/docs/cli/import/index.mdx
+++ b/website/docs/cli/import/index.mdx
@@ -9,7 +9,6 @@ description: >-
 
 > **Hands-on:** Try the [Import Terraform Configuration](https://learn.hashicorp.com/tutorials/terraform/state-import?in=terraform/state&utm_source=WEBSITE&utm_medium=WEB_IO&utm_offer=ARTICLE_PAGE&utm_content=DOCS) tutorial.
 
-<<<<<<< HEAD
 <<<<<<< HEAD
 Terraform can import existing infrastructure resources. This functionality lets you bring existing resources under Terraform management.
 
@@ -18,24 +17,11 @@ Terraform can import existing infrastructure resources. This functionality lets
 Terraform can import existing infrastructure resources. This functionality allows you take
 resources you created by some other means and bring them under Terraform
 management.
-=======
-Terraform can import existing infrastructure resources. This functionality allows you take resources you created by some other means and bring them under Terraform
-management.
-
-This method lets you slowly transition infrastructure to Terraform, or
-to be able to be confident that you can use Terraform in the future if it
-potentially doesn't support every feature you need today.
-
-~> Warning: Terraform expects that each remote object it is managing will be
-bound to only one resource address, which is normally guaranteed by Terraform
-itself having created all objects. If you import existing objects into Terraform, be careful to import each remote object to only one Terraform resource address. If you import the same object multiple times, Terraform may exhibit unwanted behavior. Refer to [State](/language/state) for more details.
->>>>>>> parent of 84edd84471 (more content updates for flow)
 
 This is a great way to slowly transition infrastructure to Terraform, or
 to be able to be confident that you can use Terraform in the future if it
 potentially doesn't support every feature you need today.
 
-<<<<<<< HEAD
 ~> Warning: Terraform expects that each remote object it is managing will be
 bound to only one resource address, which is normally guaranteed by Terraform
 itself having created all objects. If you import existing objects into Terraform,
@@ -49,15 +35,11 @@ behavior. For more information on this assumption, see
 
 <<<<<<< HEAD
 Terraform import can only import resources into the [state](/language/state). Importing does not generate configuration.
-=======
-Terraform import can only import resources into the [state](/language/state). It does not generate configuration.
->>>>>>> parent of 84edd84471 (more content updates for flow)
 
-Because of this, prior to running `terraform import` you must manually write a `resource` configuration block for the resource that describes where Terraform should map the imported object.
+Before you run `terraform import` you must manually write a `resource` configuration block for the resource. The resource block describes where Terraform should map the imported object.
 
 ## Terraform Cloud
 
-<<<<<<< HEAD
 When you use Terraform on the command line with Terraform Cloud, many commands like `apply` run inside your Terraform Cloud environment. However, the `import` command runs locally, so it does not have access to information from Terraform Cloud. To successfully perform an import, you may need to set local variables equivalent to any remote workspace variables in Terraform Cloud.
 =======
 The current implementation of Terraform import can only import resources
@@ -75,6 +57,3 @@ importing existing resources.
 
 When you use Terraform on the command line with Terraform Cloud, many commands (e.g., `apply`) run inside your Terraform Cloud environment. However, the `import` command runs locally, so it will not have access to information from Terraform Cloud. To successfully perform an import, you may need to set local variables equivalent to any remote workspace variables in Terraform Cloud.
 >>>>>>> parent of 0a7e221a49 (Remove future-facing statements)
-=======
-When you use Terraform on the command line with Terraform Cloud, many commands (e.g., `apply`) run inside your Terraform Cloud environment. However, the `import` command runs locally, so it does not have access to information from Terraform Cloud. To successfully perform an import, you may need to set local variables equivalent to any remote workspace variables in Terraform Cloud.
->>>>>>> parent of 84edd84471 (more content updates for flow)