From 55d85c9bd1d228648ebdc214579de2d7e4c7fb90 Mon Sep 17 00:00:00 2001 From: Pinkesh Date: Fri, 31 Jan 2025 10:42:19 +0530 Subject: [PATCH 1/2] Restore branch info --- .../branching-collaboration/branching.md | 42 +++++++++++++++---- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/docs/testing-deployment-publishing/branching-collaboration/branching.md b/docs/testing-deployment-publishing/branching-collaboration/branching.md index d903166f..1544706a 100644 --- a/docs/testing-deployment-publishing/branching-collaboration/branching.md +++ b/docs/testing-deployment-publishing/branching-collaboration/branching.md @@ -526,15 +526,9 @@ To configure these permissions, navigate to **Settings & Integrations > Project Closing a branch is a common practice after the branch has served its purpose, typically once its changes have been merged into another branch (like the `main` or `development` branch). By regularly closing inactive or merged branches, you help maintain a clean, efficient, and well-organized project. -### When to Close a Branch - +:::info[When to Close a Branch] - **After a Merge:** Once the branch’s changes have been merged into the `main` branch (or another target branch), it’s safe to close the branch. This often happens after a feature is complete or a bug is fixed. - **Unused Branch:** If a branch is no longer needed (e.g., a feature was abandoned or changes were made in another branch), it’s a good idea to close it. - -:::warning - -Once a branch is closed, it will no longer appear in the list of active **Branches**, meaning no further changes can be made. **This action is permanent and cannot be undone**, so ensure that all necessary work is completed or merged before closing the branch. - ::: Here’s how you can close a branch: @@ -571,6 +565,40 @@ Here’s how you can close a branch: - **Coordinate with your team:** If you’re working in a team, ensure that no one is actively using the branch before you close it, to avoid disrupting ongoing work. ::: +Once a branch is closed, it will no longer appear in the list of active branches. However, you can restore a closed branch within **30 days** of its closure. + +### Restore Branch +To restore a branch, open the **Branch Filter** menu and enable **Show Closed Branches**. Search for or select the branch you want to restore, and it will open in a new browser tab. Then, within the closed branch, open the **Branching Options** menu and select **Restore Branch** to reactivate it. + + +
+ +
+

+ + + ## FAQs
From 389f7b02ee3bdba5576a35b00dd53670e660cbcd Mon Sep 17 00:00:00 2001 From: Pinkesh Date: Fri, 31 Jan 2025 10:52:36 +0530 Subject: [PATCH 2/2] Adding John's video. --- .../branching-collaboration/branching.md | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/docs/testing-deployment-publishing/branching-collaboration/branching.md b/docs/testing-deployment-publishing/branching-collaboration/branching.md index 1544706a..e1667956 100644 --- a/docs/testing-deployment-publishing/branching-collaboration/branching.md +++ b/docs/testing-deployment-publishing/branching-collaboration/branching.md @@ -384,6 +384,34 @@ You can modify files or edit the project directly from the lower panel at any ti After editing, click **Save Changes** to confirm your changes. A red reset button appears if you want to undo your changes and restore the file to its initial state before you began editing. +For more information, check out the video below. + +
+ +
+

+ ### Resolve Merge Conflicts A merge conflict occurs when multiple team members make changes to the same part of the project.