search

ABTech / tracker

Carnegie Mellon Activities Board Technical Committee Tracker
abtech.org
22 stars 29 forks source link

Resolve #513, update new member Sunchyme link, update new member join info #528

Closed wjiang42 closed 1 year ago

wjiang42 commented 1 year ago

Timecard member link displays member.fullname instead of member.display_name, which defaults to that member's nickname

Not sure why it's showing changes that have already been merged

DaAwesomeP commented 1 year ago

Not sure why it's showing changes that have already been merged

You need to re-sync your branch. You may need to undo your commits for this pull, stash them with git stash, merge the upstream your branch, and then re-apply your changes. I can help you do this later this week if you'd like.

wjiang42 commented 1 year ago

AAAAAAAAAA my bad I did not see this comment for a week, yes I forgot to re-sync. Looks good now.

DaAwesomeP commented 1 year ago

Merged, though there's still something weird with your repo given there are 12 commits here. You may want to fetch-and-hard-reset or re-clone.