Address review comments

Signed-off-by: Timo Sand <timo.sand@f-secure.com>

Author: deiga

docs/resources/branch_default.md

@@ -8,7 +8,7 @@ description: |-
 
 Configures the default branch for a GitHub repository.
 
-~> **Note:** This resource is incompatible with the `default_branch` option of the `github_repository` resource. Using both will result in plans always showing a diff.
+~> This resource is incompatible with the `default_branch` option of the [`github_repository`](repository) resource. Using both will result in plans always showing a diff.
 
 ## Example Usage
 
@@ -68,7 +68,18 @@ resource "github_branch_default" "default" {
 
 ## Import
 
-GitHub Branch Defaults can be imported using the repository name with the [`terraform import` command](https://developer.hashicorp.com/terraform/cli/commands/import), for example:
+Import is supported using the following syntax:
+
+In Terraform v1.5.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `id` attribute, for example:
+
+```terraform
+import {
+  to = github_branch_default.default
+  id = "example"
+}
+```
+
+The [`terraform import` command](https://developer.hashicorp.com/terraform/cli/commands/import) can be used, for example:
 
 ```shell
 terraform import github_branch_default.branch_default my-repo

examples/resources/github_branch_default/import-by-string-id.tf

@@ -0,0 +1,4 @@
+import {
+  to = github_branch_default.default
+  id = "example"
+}

github/resource_github_branch_default.go

@@ -180,7 +180,6 @@ func resourceGithubBranchDefaultRead(ctx context.Context, d *schema.ResourceData
 }
 
 func resourceGithubBranchDefaultUpdate(ctx context.Context, d *schema.ResourceData, m any) diag.Diagnostics {
-	ctx = tflog.SetField(ctx, "resource_id", d.Id())
 	meta, _ := m.(*Owner)
 	client := meta.v3client
 	owner := meta.name

templates/resources/branch_default.md.tmpl

@@ -8,7 +8,7 @@ description: |-
 
 {{ .Description | trimspace }}
 
-~> **Note:** This resource is incompatible with the `default_branch` option of the `github_repository` resource. Using both will result in plans always showing a diff.
+~> This resource is incompatible with the `default_branch` option of the [`github_repository`](repository) resource. Using both will result in plans always showing a diff.
 
 {{ if .HasExamples -}}
 ## Example Usage
@@ -20,9 +20,29 @@ description: |-
 {{- end }}
 
 {{ .SchemaMarkdown | trimspace }}
+{{- if or .HasImport .HasImportIDConfig .HasImportIdentityConfig }}
 
 ## Import
 
-GitHub Branch Defaults can be imported using the repository name with the [`terraform import` command](https://developer.hashicorp.com/terraform/cli/commands/import), for example:
+Import is supported using the following syntax:
+{{- end }}
+{{- if .HasImportIdentityConfig }}
+
+In Terraform v1.12.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `identity` attribute, for example:
+
+{{tffile .ImportIdentityConfigFile }}
+
+{{ .IdentitySchemaMarkdown | trimspace }}
+{{- end }}
+{{- if .HasImportIDConfig }}
+
+In Terraform v1.5.0 and later, the [`import` block](https://developer.hashicorp.com/terraform/language/import) can be used with the `id` attribute, for example:
+
+{{tffile .ImportIDConfigFile }}
+{{- end }}
+{{- if .HasImport }}
+
+The [`terraform import` command](https://developer.hashicorp.com/terraform/cli/commands/import) can be used, for example:
 
 {{codefile "shell" .ImportFile }}
+{{- end }}