learn-git-basics icon indicating copy to clipboard operation
learn-git-basics copied to clipboard

Published 20 hours ago • verified publisher icon NataliaLKB

Merging Changes with Main Branch

Open nelsonic opened this issue 9 years ago • 3 comments

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...

nelsonic avatar Apr 07 '15 15:04 nelsonic

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.

NataliaLKB avatar Apr 10 '15 11:04 NataliaLKB

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.

nelsonic avatar Apr 10 '15 14:04 nelsonic

Good point. I think a FAQ would really help!

NataliaLKB avatar Apr 10 '15 14:04 NataliaLKB