-
Notifications
You must be signed in to change notification settings - Fork 83
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
Include adding upstream? #5
Comments
Actually I'm struggling to come up with a good demo for this. |
@gaand upstream added |
Do you think this is appropriate scope? I never have students update a talk repo fork after I deliver it. |
I was so confused by the discussion until I saw the rename. @berziiii I'm going to rename it back so the conversation makes sense and add a needs discussion tag. For now I'm going to keep it. @jrhorn424 @gaand thoughts on this? |
I'm still not sure this makes sense. We could demo it by adding the ga-wdi-boston upstream, I suppose. @payne-chris-r What are your thoughts on showing remotes and upstreams? Maybe not for rebasing but at least to see the remote commands? @gaand |
Didn't have time to address this for this iteration. I think it's a good idea, and adding the main repo as an upstream is probably a good idea. |
@payne-chris-r Looks like it's in there? |
Wat? |
They do. If they have merger conflicts however I usually explain them instead of solving due to time. |
I'm still in favor of removing this and doing it JIT if it is ever needed. |
JIT = just in time @jrhorn424? |
I think it's ok but maybe better in git-gitworkflow when they've had more experience with git (or whatever the later git lesson is called... Im on my phone) |
Could close and reference from Issue #10 |
For those rebase moments.
The text was updated successfully, but these errors were encountered: