التفرّع والدمج باستخدام Git من سطر الأوامر

You know how to commit and track files. Branches let you develop features in isolation without disturbing the main line of work, then merge them back when ready.

git branch lists branches and marks the current one with an asterisk.

git switch -c name creates a branch and moves to it in one step. (Older Git uses git checkout -b.)

Commits you make now belong only to the feature branch, leaving main untouched.

Return to main with git switch main. Your feature work is safely stored on its own branch.

From main, git merge brings the feature commits in. A fast-forward happens when main has no new commits.

If the same lines changed on both branches, Git pauses and marks conflicts with <<<<<<< markers. Edit the file to resolve, then stage and commit.

After merging, clean up with git branch -d. Git refuses if the branch is not merged, protecting your work.

git diff between branches shows exactly what differs before you merge.

Share a branch by pushing it and setting upstream tracking with -u.

The feature-branch loop: branch from main, commit, push, open a pull request, merge, delete the branch. This keeps history organized and reviewable.

Which single command both creates a new branch and switches to it?

You can now manage parallel work:

• git switch -c creates and moves to a branch
• git merge integrates; conflicts are resolved by editing then committing
• git branch -d cleans up merged branches
• git push -u origin shares them

Branch per feature, merge when done.