Merging Changes with Main Branch

NataliaLKB / learn-git-basics

A Beginner's Guide to Git

63 stars 116 forks source link

Merging Changes with Main Branch #25

Open nelsonic opened 9 years ago

nelsonic commented 9 years ago

https://github.com/NataliaLKB/learn-git-basics/blame/1116839e12c4165cb1b232747b466189e216ec7c/README.md#L202 In some cases your changes will be merged into a diff "main" or "default" branch such as "develop"; it will depend on the preference of your team...

NataliaLKB commented 9 years ago

That is a great point. But is this something that people need to know within the first week of the course? I am trying not to add anything that makes it more confusing, as there are plenty of more advanced tutorials for these purposes.

nelsonic commented 9 years ago

Agree minimise confusion wherever possible. That's why having a FAQ section might be handy. https://github.com/NataliaLKB/learn-git-basics/issues/20 especially if you want to encourage contributions.

NataliaLKB commented 9 years ago

Good point. I think a FAQ would really help!