Master Git Feature Branches, Remote Management, and Team Collaboration in 5 Steps

1. Feature Branch Workflow

When adding a new feature, create a dedicated feature‑vulcan branch to keep the main line clean. After development, merge the branch back and delete it. If the feature is later cancelled, you can force‑delete the unmerged branch with git branch -D feature‑vulcan.

Commit the changes on the feature branch:

Switch to the dev branch before merging:

If the feature must be discarded, use git branch -D to delete it without losing merged work.

2. Viewing Remote Repository Information

Git automatically links the local master branch to the remote origin. To list remote details, run: git remote For URLs and fetch/push information, use:

git remote -v

3. Pushing Branches

Push a local branch to its remote counterpart with: git push origin master Replace master with any branch name, e.g., git push origin dev for the development branch.

Whether a branch should be pushed depends on collaboration needs: master and dev are usually shared, bug branches may stay local unless reviewed, and feature branches are pushed only when teammates work on them.

4. Fetching Branches

Team members clone the repository (default origin/master visible). To work on dev, they create a local tracking branch:

git checkout -b dev origin/dev

After making changes, push with git push origin dev. If the push fails due to remote updates, first pull the latest changes: git pull origin dev Resolve any conflicts, commit, and push again.

If git pull reports “no tracking information”, set the upstream link:

git branch --set-upstream-to origin/dev dev

5. Multi‑person Collaboration Mode

Typical workflow:

Attempt git push origin <branch>.

If it fails, run git pull to integrate remote updates.

Resolve any merge conflicts and commit locally.

Push again with git push origin <branch>.

If a branch lacks a tracking relationship, create it with

git branch --set-upstream-to <branch> origin/<branch>

.

6. Summary

View remote information using git remote -v.

New local branches are invisible to others until pushed.

Push with git push origin <branch>; on failure, pull first.

Create a local branch that tracks a remote one via git checkout -b <branch> origin/<branch>.

Link a local branch to its remote counterpart using

git branch --set-upstream <branch> origin/<branch>

.

Fetch updates with git pull and resolve conflicts before pushing.