Git Bitbucket Branch
Create a Branch
On Bitbucket, access your repository and click the branch link.
There you can create a new Branch. Type in a descriptive name, and click Create branch:
The branch
should now be created and active. You can confirm which branch you
are working on by looking at the branch button. See that it now says "html-skeleton"
instead of "main"?
Start working on an existing file in this branch. Click the "index.html
"
file and start editing:
After you have finished editing the file, you can click the "View Diff" button to see the changes you made highlighted:
If you are happy with the change, add a comment that explains what you did, and click Commit.
You now have a new branch
on Bitbucket, updated with some changes!
Switch Branch
To switch to another branch in Bitbucket's web interface, click the branch dropdown and select the branch you want to work on.
To switch branches using the command line:
Example
git switch branch-name
Delete Branch
To delete a branch on Bitbucket, go to the branches page, find your branch, and click the delete icon (trash can).
To delete a branch using the command line:
Example
git branch -d branch-name
To delete a remote branch:
Example
git push origin --delete branch-name
Rename Branch
To rename a branch using the command line:
Example
git branch -m old-name new-name
Merge Branch
To merge a branch into another on Bitbucket, open a Pull Request and follow the prompts to merge.
To merge using the command line:
Example
git merge branch-name
View Branches
To see all branches in your repository on Bitbucket, click the branch dropdown at the top of the file list.
To view branches using the command line:
Example
git branch
Protected Branches
Some branches (like main
) may be protected, meaning you cannot delete or force-push to them without special permissions. This helps prevent accidental changes to important branches.
Troubleshooting
- Cannot delete branch: Make sure the branch is not protected or the default branch.
- Merge conflicts: Resolve conflicts locally, then push and merge again.
- Branch not visible: Refresh the page or check your permissions.
Exercise?What is this?
Test your skills by answering a few questions about the topics of this page
git branch-name