@@ -165,10 +165,20 @@ inside the Terraform. See the
165165[workspace tags documentation](../admin/templates/extending-templates/workspace-tags.md)
166166for more information.
167167
168+ <<< <<< <
168169> [! NOTE]
169170> Workspace tags defined with the` coder_workspace_tags` source
170171> template** do not** automatically apply to the template import job! You may
171172> need to specify the desired tags when importing the template.
173+ =======
174+ < blockquote class=" admonition note" >
175+
176+ Workspace tags defined with the` coder_workspace_tags` source template
177+ ** do not** automatically apply to the template import job! You may need to
178+ specify the desired tags when importing the template.
179+
180+ < /blockquote>
181+ >>>>>>> c7a48ec08 (replace [! NOTE])
172182
173183A provisioner can run a given build jobif one of the below is true:
174184
@@ -190,6 +200,7 @@ However, it will not pick up any build jobs that do not have either of the
190200from templates with the tag` scope=user` jobs from templatesin
191201different organizations.
192202
203+ <<< <<< <
193204> [! NOTE]
194205> If you only run tagged provisioners, you will need to specify aset of
195206> tags that matches at least one provisionerfor _all_ template importjobs and
@@ -198,6 +209,18 @@ different organizations.
198209> You may wish to run at least one additional provisioner with no additional
199210> tags so that provisionerjobs with no additional tags defined will be picked
200211> up instead of potentially remainingin the Pending state indefinitely.
212+ =======
213+ < blockquote class=" admonition note" >
214+
215+ If you only run tagged provisioners, you will need to specify aset of tags
216+ that matches at least one provisionerfor _all_ template importjobs and
217+ workspace build jobs.
218+ You may wish to run at least one additional provisioner with no additional tags
219+ so that provisionerjobs with no additional tags defined will be picked up
220+ instead of potentially remainingin the Pending state indefinitely.
221+
222+ < /blockquote>
223+ >>>>>>> c7a48ec08 (replace [! NOTE])
201224
202225This is illustratedin the below table:
203226