Git - How Branches work?

Question

I have a question about using them, so i don't know how can i explain the question but i'll use a scenario so you can understand me.

I started a repository and my partner told me we have to use branches so we can work without any problem(replacing any code using git add --all) and we will working with a base "copy" of the project.
So if he adds for example a folder with php files, he must do it in the master branch? or i can access to his branch and get those files?
Thank you

A branch is a label at the top of a commit tree. – evolutionxbox Mar 16 '18 at 08:39 — evolutionxbox, Mar 16 '18 at 08:39

score 1 · Answer 1 · answered Mar 16 '18 at 03:34

1

you should always push the changes to your local branch and than merge it to the master.you don't have to use his branch.your partner can push the changes to master and you should be able to rebase/merge from the master...

answered Mar 16 '18 at 03:34

Vaibhav Nagar

51
3

score 1 · Answer 2 · answered Mar 16 '18 at 03:42

You can fetch files from any branch at any point in time. But when you pull from another branch you need to make sure any changes made in the current branch is committed before you pull from your partner's branch.

You can also look at Git tree answer which explains how git branch is like a tree and you can switch between two points at any point.

score 1 · Accepted Answer · answered Mar 16 '18 at 03:42

1

I will explain the basic behind the branching in git.

A branch represents an independent line of development. Branches serve as an abstraction for the edit/stage/commit process. You can think of them as a way to request a brand new working directory, staging area, and project history. New commits are recorded in the history for the current branch, which results in a fork in the history of the project.take a look

From your master repo you create a separate branch and after your work is complete, you first commit to your branch--> Push the code to Remote repository -> after review, you can merge it back to master. This way everybody has his independent workspace and all developers can work in parallel.

answered Mar 16 '18 at 03:42

Sangam Belose

4,262
8
26
48

So if in case both of us are working in one branch will be like 2 working directories or just one? – QuickAccount123 Mar 16 '18 at 03:48
The working directory is you local machine folder where you have checkout the branch. so both of you will have separate working directory. – Sangam Belose Mar 16 '18 at 03:51
@QuickAccount123 Check this question answer about working directory. https://stackoverflow.com/questions/30205325/what-is-the-working-directory-of-a-git-repository – Sangam Belose Mar 16 '18 at 03:55
Side question: Which tool did you use to draw that diagram? – Lasse V. Karlsen Mar 16 '18 at 05:35
@LasseVågsætherKarlsen its snip. You can use powerpoint to draw this. – Sangam Belose Mar 19 '18 at 05:11

Git - How Branches work?

3 Answers3