Git & Issues about Simultaneous Teamwork

Question

I am new to Git. I have a public repo on GitHub and me & my friend need to work on the project simultaneously. We are using Netbeans 7.1 which has built in Git features. I can clone from and submit to GitHub but for example consider we have the following structure:

• A.java
• B.java

• C.java

  1. If User #1 changes A.java and User #2 changes B.java, how do we merge them?
  2. If User #1 and User #2 both changes C.java, what happens?

There is remote/Fetch & Remote/Pull and I cannot understand the difference. We will work on the school project as 4 people and we want to also learn version controlling.

Answer 1

What you need is a basic tutorial about git. I like this one: git Magic

The short answer is, git is built for EXACTLY this need. You just have to understand how it merges and combines changes from multiple users. But it works brilliantly once you understand it.