Managing branches

Creating a new branch locally

To create a new branch and switch to it, use the following command:

git checkout -b [branch-name]

This command creates a new branch in your local repository, and switches to it by updating the index and the files in the working tree.

Pushing the new branch remotely

Once you've completed your work, commit the changes, and push them to your remote repository:

git add -A
git commit -m "commit message"
git push -u origin [branch-name]

The -u flag sets the upstream for the branch, allowing you to use git push and git pull without explicit arguments in the future.

Deleting a branch locally

To delete a local branch that you no longer need, use:

git branch -d [branch-name]

If the branch has unmerged changes, you can forcefully delete it using:

git branch -D [branch-name]

Deleting a branch remotely

To delete a branch from the remote repository, use:

git push origin --delete [branch-name]

Renaming a branch

To rename a branch while you are on it, use:

git branch -m [new-branch-name]

To rename a branch while you are not on it, use:

git branch -m [old-branch-name] [new-branch-name]

Feature Development and Final Merge

This chart represents the process of developing a feature branch and merging it into the main branch:

graph TD;
    A[Main Branch]:::main --> B[Initial Commit]:::initial
    A --> C[Development Branch]:::development
    C --> D[Feature Commit 1]:::feature1
    C --> E[Feature Commit 2]:::feature2
    D --> F[Feature Commit 3]:::feature3
    F -->|Merge| G[Merge Commit]:::merge
    G --> A

    classDef main fill:#add8e6, stroke:#000, stroke-width:2px;
    classDef initial fill:#90ee90, stroke:#000, stroke-width:2px;
    classDef development fill:#f08080, stroke:#000, stroke-width:2px;
    classDef feature1 fill:#fafad2, stroke:#000, stroke-width:2px;
    classDef feature2 fill:#ffb6c1, stroke:#000, stroke-width:2px;
    classDef feature3 fill:#ffcc99, stroke:#000, stroke-width:2px;
    classDef merge fill:#e6e6fa, stroke:#000, stroke-width:2px;
    classDef link stroke:#696969, stroke-width:2px;

        linkStyle 0 stroke:#2ca02c,stroke-width:2px
    linkStyle 1 stroke:#2ca02c,stroke-width:2px
    linkStyle 2 stroke:#FFA500,stroke-width:2px
    linkStyle 3 stroke:#FF0000,stroke-width:2px
    linkStyle 4 stroke:#FFA500,stroke-width:2px
    linkStyle 5 stroke:#FFA500,stroke-width:2px
    linkStyle 6 stroke:#667700,stroke-width:2px

Keep Branches Short-Lived: Branches should be focused and merged back into the main line of development (often main or master) as soon as possible.
Use Descriptive Names: Branch names should convey the purpose (e.g., feature/login, bugfix/header-bug) to make collaboration easier.
Regularly Pull Changes: If working in a team, make sure to regularly pull changes from the main branch into your feature branches to minimize merge conflicts.
Rebase vs. Merge: If you want to maintain a clean project history, consider using git rebase instead of git merge. This linearizes the commit history.
Use Pull Requests (PR): When collaborating, use PRs to review code before merging it into the main branch to ensure code quality and maintainability.

By following these practices, you can effectively manage branches in Git and maintain a clean history of your project's development.

Notes about IT