Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merging Changes with Main Branch #25

Open
nelsonic opened this issue Apr 7, 2015 · 3 comments
Open

Merging Changes with Main Branch #25

nelsonic opened this issue Apr 7, 2015 · 3 comments

Comments

@nelsonic
Copy link
Contributor

nelsonic commented Apr 7, 2015

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
Copy link
Owner

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
Copy link
Contributor Author

Agree minimise confusion wherever possible. That's why having a FAQ section might be handy. #20 especially if you want to encourage contributions.

@NataliaLKB
Copy link
Owner

Good point. I think a FAQ would really help!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@nelsonic @NataliaLKB