search

ga-wdi-boston / git

Other
0 stars 107 forks source link

Lm01/solution #37

Closed MicFin closed 7 years ago

MicFin commented 7 years ago

Do not merge with master. Create solution branch.

BenGitsCode commented 7 years ago

Does a solution branch make sense here? I only ask because this add solution doesn't seem to be adding an actual solution. Wouldn't the solution have to include differing commits that change the story?

MicFin commented 7 years ago

I see what you mean. It could be improved. The solution branch includes a folder and two files: /game-of-gits, game-of-gits/sad-tale.md and game-of-gits/the-stark-bunch.md.

https://github.com/ga-wdi-boston/git#code-along-making-a-local-repository

https://github.com/ga-wdi-boston/git#removing-now-we-need-to-remove-files-previously-added

The developers delete the game-of-gits/the-stark-bunch.md and add other text to and then remove it from the game-of-gits/sad-tale.md but it seems like including those files in a solution branch would be ok.

I am fine with the solution as is, with added commits, or no solution as it was.

BenGitsCode commented 7 years ago

Great clarification Mike! And as you said, we previously had no solution branch at all (there is a solution but it's 2yrs old and is not in line master's diagnostic. AFAIK All repos are being updated with a solution branch no matter what, per process. I'll check with a lead before pushing this, as I don't want to stomp that history blindly.

@payne-chris-r merge into the existing solution? or rename this solution and force push?

payne-chris-r commented 7 years ago

Woah. This solution looks old. I think the lm01/solution branch looks more accurate given what @MicFin has said. @gaand @jrhorn424 do you know more about this history than I? Is it ok to wax the old solution? Should we archive it? Process for archiving (if necessary)?

jrhorn424 commented 7 years ago

Please do not wax it. @payne-chris-r Instead, rename it archive/solution for now. I'll take care of moving it to attic, eventually.

payne-chris-r commented 7 years ago

Moved to archive/solution