mwarsco questions

mwarsco answers

• What happens when you git push but someone else has already committed something you don't have on your local repo?
• Git merge one branch into two other branches