-
Notifications
You must be signed in to change notification settings - Fork 7.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Community Section Update #252
Community Section Update #252
Conversation
mateoholman
commented
Nov 7, 2017
- Removed outdated/broken/invalid links
- Added new content / resources
- Added a "tools" section
- Organized layout and links within each subsection
Deploy preview ready! Built with commit bf39c38 |
Why is there a 10,399 line long Also, you have a couple of conflicts you might want to rebase and resolve |
67aab76
to
a194222
Compare
Removed inactive meetups. Renamed USA meetups Reorganized each country meetup by city
Changed embeded videos to links Added resources from wiki Moved articles from videos wiki section Standardized title formatting
Added new free and paid courses Added new resources Added new content and reorganized layout Removed outdated links. Added descriptions. Sorted alphabetically Removed inactive projects and normalized layout Removed outdated resources. Added new resources. Ordered list Updated reousrces and reordered list Removed links to outdated components Organized alphabetically. Removed duplicate links Moved links from misc to appropriate categories
Removed the error log and added it to the .gitignore! Upgraded GraphQL to resolve merge conflict with master Changed to resolve merge conflict with master
a194222
to
e6a739d
Compare
Oh boy, that error log was totally unintentional! 😝 Sorry about that! I believe I resolved the conflicts. I rebased and squashed some commits to try and tidy things up. This is my first attempt at a respectable contribution, so don't hesitate to point anything else out that looks wacky! 😵 |
gatsby-node.js
Outdated
`Warning: No slug found for "${relativePath}". Falling back to default "${slug}".`, | ||
`Warning: No slug found for "${ | ||
relativePath | ||
}". Falling back to default "${slug}".`, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would not expect to see white-space only changes like this. Did you run yarn prettier
before committing? 😄
package.json
Outdated
@@ -49,6 +49,7 @@ | |||
"gatsby-transformer-remark": "^1.7.2", | |||
"gatsby-transformer-sharp": "^1.6.1", | |||
"glamor": "^2.20.40", | |||
"graphql": "0.10.5", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wouldn't expect to see this change, or any of the changes to the yarn.lock
file below, given this PR mostly touches markdown files. Did you mean to commit them? (If not, do you mind reverting them?)
Looks like the Maybe just try saving this one from GitHub over the one in your branch and committing it? |
Hmmm. I reverted back as requested to remove the changes mentioned in the package.json file. My yarn.lock file has conflicts due to a number of dependencies being behind master, is that normal? Also, I ran yarn check-all & yarn prettier before the commit, but it still looks like some of those white-space only changes are showing up? Should I change them back manually & commit? Thanks for your patience @bvaughn 😄 |
This commit should only be adding markdown files, so no changes should be needed in either You probably accidentally updated the file somehow. (Not sure.) But it should be safe to revert it to exactly match what's in master, and then
Really not sure what's going on here. Running If I save your modifications locally and run |
That didn't seem to work either. I'll revert the commit and try grabbing the files from master so they match and try again. |
Phew, that seemed to have done the trick with the white-space issues. It still shows the yarn.lock with changes, but I believe it is the same as the master branch yarn.lock file now? 😁 |
I think you're right that the contents of One way to avoid this sort of thing is to either run I would just cherry-pick your commits into a new branch, minus the yarn issues, except that you have commits like 4e74896 that seem to mix markdown and Yarn changes together 😁 |
There are many ways you can recover from this situation, but maybe the simplest one in this case is just to make a new branch 😄 Here's one way you could do it: # Update your local copy of master
git fetch origin
git checkout master
git pull origin master
# Update your branch to be in-sync with master
git checkout mateoholman-community-section
git merge master
# Dump a patch of the differences between your branch and master
git diff master > ~/Desktop/diff
# Make a new branch from master
git checkout master
git checkout -b mateoholman-community-section-new
# Patch your changes onto this new, clean branch
git apply ~/Desktop/diff
# Visually verify that no unexpected changes are here (like yarn.lock)
# Then commit the changes
git status
git add -- .
git commit -m "<your commit message here>"
# Push your new, clean branch and create a PR from it
git push mateoholman mateoholman-community-section-new I think GitHub will let you update this PR to point to the new branch once you have done this. Worst case you can close this PR and open a new one and CC me on it. |
I couldn't change this PR to point to a new target (I can only change the base I think), so I'll open a new one and CC you. Thanks again for all your help and patience with this PR -- I won't make the same mistakes in future PR's! 😌 |
rapidamente não possui acento agudo na sílaba "ra". Em português há acentuação gráfica apenas nas três últimas sílabas de todas as palavras do nosso idioma, sem exceção.
…s#252) 语义不太对,原文是 the alert will show the count variable at the time you clicked the “Show alert” button. 意思是 alert 会显示点击按钮时的 count 变量,而不是「 alert 会 在你点击『Show alert』按钮时 显示 count 变量」