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

Include adding upstream? #5

Open
gaand opened this issue Mar 9, 2016 · 14 comments
Open

Include adding upstream? #5

gaand opened this issue Mar 9, 2016 · 14 comments

Comments

@gaand
Copy link

gaand commented Mar 9, 2016

For those rebase moments.

@RealWeeks
Copy link
Member

Actually I'm struggling to come up with a good demo for this.

@RealWeeks
Copy link
Member

@gaand upstream added

@jrhorn424
Copy link

Do you think this is appropriate scope? I never have students update a talk repo fork after I deliver it.

@berziiii berziiii changed the title Include adding upstream? Remove upstream section May 10, 2016
@RealWeeks
Copy link
Member

RealWeeks commented Jul 10, 2016

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?

@RealWeeks RealWeeks changed the title Remove upstream section Include adding upstream? Jul 10, 2016
@jrhorn424 jrhorn424 removed the ready label Aug 18, 2016
@jrhorn424
Copy link

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

@payne-chris-r
Copy link
Contributor

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.

@jrhorn424
Copy link

@payne-chris-r Looks like it's in there?

@jrhorn424
Copy link

Wat?

@gaand
Copy link
Author

gaand commented Oct 15, 2016

@J-Weeks When you lead this do the developers usually get through the upstream part?

I need more data to resolve this and #10

@RealWeeks
Copy link
Member

RealWeeks commented Oct 17, 2016

They do. If they have merger conflicts however I usually explain them instead of solving due to time.

@jrhorn424
Copy link

jrhorn424 commented Jan 9, 2017

I'm still in favor of removing this and doing it JIT if it is ever needed.

@payne-chris-r
Copy link
Contributor

JIT = just in time @jrhorn424?

@payne-chris-r
Copy link
Contributor

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)

@MicFin
Copy link
Contributor

MicFin commented Mar 19, 2017

Could close and reference from Issue #10

@MicFin MicFin removed the question label Mar 19, 2017
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

7 participants
@jrhorn424 @MicFin @berziiii @gaand @RealWeeks @payne-chris-r and others