search

opensource-ny / OpenSource-NY

MIT License
10 stars 14 forks source link

I want to make some changes on the git workflow #64

Closed guti21js closed 5 years ago

guti21js commented 5 years ago

I have a different git workflow that stems from the pdf professor weiss put up Git Workflow . I think @mxmsunny had some issues using the one in the readme as well.

mxmsunny commented 5 years ago

Yeah I had a slight issue with one part of it: 9E1920C4-708B-4BE4-BFE8-A137C3D4B4B5

yizongk commented 5 years ago

Ahhhhh that part!

I meant 

git pull upstream master        // This is the part where you fix any merge conflict before you git push to your fork's feature-branch
yizongk commented 5 years ago

So what do you have in mind to change in the README? Do a PR, and we can all check it!

yizongk commented 5 years ago

Fix and done. Thanks for those who helped!