search

UW-Madison-DSI / student-developer-setup

Bootstrapped instructions for setting up development environments for student developers
BSD 3-Clause "New" or "Revised" License
1 stars 4 forks source link

setup working environment #10

Open ShuSure opened 1 year ago

matthewfeickert commented 1 year ago

@ShuSure :wave: Because I didn't plan things all the way through :grimacing: when PR #11 got merged it could possibly create merge conflicts for everyone else who had a PR open. To get around this (a normal thing in development so no worries) just click the update branch button that is open

Screenshot from 2023-02-09 20-08-48

and then select the merge option. Afterwards, run

git fetch --all --prune

and then on your feature branch (this branch)

git pull

If you have any trouble just escape with git merge --abort and first google for resources and if you don't find any helpful ones let me know.

matthewfeickert commented 1 year ago

@ShuSure you marked this PR as ready for review, but it looks like you still have more work to do. Did you mean to do this? If not, do you have questions that I can address?

ShuSure commented 1 year ago

Hi Matt, I think this time it should be fine.. I dont know if this work other than my github/ computer, but it runs pretty good on my computer now....

matthewfeickert commented 1 year ago

:wave: Hi @ShuSure. Did you have any questions on my comments from my previous review?

ShuSure commented 1 year ago

Hi Matt, sorry I just finished a crazy final with stomach flu, I've commit the new changes as you required, please tell me if there's any problem to solve.