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.

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

The setting up page can cause merge issues #13

Open
3 tasks
dpells opened this issue Jan 20, 2022 · 0 comments
Open
3 tasks

The setting up page can cause merge issues #13

dpells opened this issue Jan 20, 2022 · 0 comments

Comments

@dpells
Copy link
Member

dpells commented Jan 20, 2022

The Initializing section of Setting Up has init, add, and commit on one line which can be confusing, and if the GitHub repo was created with a README, LICENSE, and gitignore, then the push will fail.

  • Move the setup commands to different lines for clarity
  • before the push command, add:
  • git branch --set-upstream-to=origin/main so we can pull
  • git pull --allow-unrelated-histories so that the pull won't interfere with our local files
  • Either on this slide or later, we can talk about git init [proj_name]
  • This brings up the possibility of two new slides: connecting to an existing GitHub repo with code; starting completely from scratch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant