search

ga-wdi-boston / git-github

Lesson to introduce Github, forking, cloning and synchronizing change between team members.
Other
0 stars 83 forks source link

Include adding upstream? #5

Open gaand opened 8 years ago

gaand commented 8 years ago

For those rebase moments.

RealWeeks commented 8 years ago

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

RealWeeks commented 8 years ago

@gaand upstream added

jrhorn424 commented 8 years ago

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

RealWeeks commented 8 years ago

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?

jrhorn424 commented 8 years ago

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 commented 8 years ago

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 commented 8 years ago

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

jrhorn424 commented 8 years ago

Wat?

gaand commented 7 years ago

@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 commented 7 years ago

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

jrhorn424 commented 7 years ago

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

payne-chris-r commented 7 years ago

JIT = just in time @jrhorn424?

payne-chris-r commented 7 years ago

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 commented 7 years ago

Could close and reference from Issue https://github.com/ga-wdi-boston/git-github/issues/10