ImperialCollegeLondon / intermediate_grad_school_git_course

Intermediate Git and GitHub for Effective Collaboration
https://imperialcollegelondon.github.io/intermediate_grad_school_git_course/
Other
3 stars 1 forks source link

Move content on `git stash` to merge conflicts section #94

Open alexdewar opened 1 month ago

alexdewar commented 1 month ago

It probably fits better there.

Suggested by @AdrianDAlessandro.

AdrianDAlessandro commented 4 weeks ago

We should probably re-work it to a more practical, real-world example of what stash is used for. For me, that is:

It could be in either the merge conflicts section or the new pushing and pulling section in #88 (I find I often need to stash when pulling changes)