This is an automated cherry-pick of pingcap#15875

Signed-off-by: ti-chi-bot <[email protected]>

ticdc/ticdc-changefeed-overview.md

@@ -19,7 +19,11 @@ The states in the preceding state transfer diagram are described as follows:
 - `Stopped`: The replication task is stopped, because the user manually pauses the changefeed. The changefeed in this state blocks GC operations.
 - `Warning`: The replication task returns an error. The replication cannot continue due to some recoverable errors. The changefeed in this state keeps trying to resume until the state transfers to `Normal`. The maximum retry time is 30 minutes. If it exceeds this time, the changefeed enters a failed state. The changefeed in this state blocks GC operations.
 - `Finished`: The replication task is finished and has reached the preset `TargetTs`. The changefeed in this state does not block GC operations.
+<<<<<<< HEAD
 - `Failed`: The replication task fails. The changefeed in this state does not keep trying to resume. To give you enough time to handle the failure, the changefeed in this state blocks GC operations. The duration of the blockage is specified by the `gc-ttl` parameter, with a default value of 24 hours. If the underlying issue is resolved within this duration, you can manually resume the changefeed. Otherwise, if the changefeed remains in this state beyond the `gc-ttl` duration, the replication task cannot resume and cannot be recovered.
+=======
+- `Failed`: The replication task fails. The changefeed in this state does not keep trying to resume. To give you enough time to handle the failure, the changefeed in this state blocks GC operations. The duration of the blockage is specified by the `gc-ttl` parameter, with a default value of 24 hours. For v6.5.6 and later v6.5 patch versions, if the underlying issue is resolved within this duration, you can manually resume the changefeed. Otherwise, if the changefeed remains in this state beyond the `gc-ttl` duration, the replication task cannot resume and cannot be recovered.
+>>>>>>> 9d2413baa6 (Documented resuming changefeed from Failed state (#15555) (#15875))
 
 > **Note:**
 >
@@ -35,7 +39,11 @@ The numbers in the preceding state transfer diagram are described as follows.
 - ⑥ The changefeed encounters an unrecoverable error and directly enters the failed state. At this time, the changefeed continues to block upstream GC for a duration specified by `gc-ttl`.
 - ⑦ The replication progress of the changefeed reaches the value set by `target-ts`, and the replication is completed.
 - ⑧ The changefeed has been suspended for a duration longer than the value specified by `gc-ttl`, thus encountering GC advancement errors, and cannot be resumed.
+<<<<<<< HEAD
 - ⑨ If the cause of the failure has been resolved, and the changefeed was suspended for a duration shorter than the value specified by `gc-ttl`, run the `changefeed resume` command to resume the replication task.
+=======
+- ⑨ For v6.5.6 and later v6.5 patch versions, if the cause of the failure has been resolved, and the changefeed was suspended for a duration shorter than the value specified by `gc-ttl`, run the `changefeed resume` command to resume the replication task.
+>>>>>>> 9d2413baa6 (Documented resuming changefeed from Failed state (#15555) (#15875))
 
 ## Operate changefeeds