Closed thadseaver closed 8 years ago
One quick update: can you update the list-like content (such as interface elements) so that they are markdown lists (ul)?
Sure, but I didn't for Make a Time Calculator and most of Make a time clock web app. Should I update those as well?
@melanierichards I'm lost. My master branch shows that I'm even with your master but my lottery-numbers branch is 2 commits ahead and 2 commits behind your master according to Github. In the command line, both branches say nothing to commit, working directory clean.
I've tried merge and pull from this page you sent me but I get a not something we can merge error.
Any advice? In the meantime, I'll keep googling.
You'd need to do a git fetch
instead of a git pull
from the main repo. On your command line do git remote -v
to double-check you have the right name for the main repo. Let's say it's called "main". You'd then do git fetch main
, and that will bring down the changes. Then do git merge main/master
(or it's git merge main master
, I always forget) to actually merge the changes into your master branch.
Oh also feel free to update the other ideas to have those bullets as well.
In the command line, does it matter if I'm on my master or lottery-number branch when I use those commands?
Oh yeah sorry I guess you'd be pulling into whatever your current branch is (so lottery-number
in this case)
@melanierichards Not sure why it worked, but it did.
Thanks @thadseaver, sorry it took me so long to look at this last update!
Thanks @thadseaver! One quick update: can you update the list-like content (such as interface elements) so that they are markdown lists (ul)?
Ex:
Also, I merged your other PR so you'll need to update from the master repo.