Skip to content
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

Adding explanatory text to electricity-per-capita-world.md #21

Merged
merged 8 commits into from
Feb 11, 2023

Conversation

willemfrishert
Copy link

@willemfrishert willemfrishert commented Nov 23, 2022

Task of #14: Add English texts to the published infographics

Preview Build

Current preview build is available at https://en-facts-on-climate--preview-electricity-per-capita-wo-xkc3boh5.web.app/infographics/electricity-per-capita-world

What does this PR do?

Commented out links:

@willemfrishert willemfrishert self-assigned this Nov 23, 2022
@willemfrishert willemfrishert changed the title Adding explanatory text to _infographics/energy/electricity-per-capita-world.md Adding explanatory text to electricity-per-capita-world.md Dec 29, 2022
@tjarnikova
Copy link
Contributor

All comments addressed, looks good.

@mukrop mukrop force-pushed the preview-electricity-per-capita-world branch from 7f52545 to fd0b23a Compare February 11, 2023 23:42
@mukrop
Copy link
Member

mukrop commented Feb 11, 2023

I've rebased the branch and resolved conflicts. Though, I have to say the history you created is quite convoluted with multiple merged from master and similar unfortunate moments.
@willemfrishert, I would strongly suggest to keep linear history even during development. That is, if you need updated files from current master, rebase the whole branch there (rather then making a merge commit from master there). If there's a conflict, you'll resolve it there and just once. The final rebase on master will then be clean with no need to rebase and resolve the same conflicts again.

@willemfrishert, would you be able to clean out the current history – rebase all open branches on master to prevent rebase conflicts on final merge? Would you take it as a developmental git challenge? Or should I do it? Or would you appreciate more detailed explanation what I suggest and why? Let me know :-). (Maybe in the Slack is a more appropriate place.)

@mukrop mukrop merged commit 32a70b8 into master Feb 11, 2023
@mukrop mukrop deleted the preview-electricity-per-capita-world branch February 11, 2023 23:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants