search

JoshOrndorff / recipes

A Hands-On Cookbook for Aspiring Blockchain Chefs
GNU General Public License v3.0
378 stars 186 forks source link

Fix broken links #282

Closed danforbes closed 4 years ago

danforbes commented 4 years ago

I'm a little confused by this diff, but it doesn't seem "wrong" :thinking:

riusricardo commented 4 years ago

Agree, it looks good but CI fails :(

danforbes commented 4 years ago

@riusricardo CI just passed :tada:

JoshOrndorff commented 4 years ago

Just came here to do this and was pleasantly surprised to see you had done it already :) Thanks!

Any idea how to get these changes back to develop branch? Here are two things I've tried and the problems I encountered.

Merging

git checkout develop
git checkout -b joshy-port-link-fixes
git merge df/chore/fix-links

This approach results in a bazillion merge conflicts almost all related to crates.io vs github dependencies. It makes sense that these would conflict as develop is always using github deps and master is always using crates.io deps.

Cherry-Picking

git checkout develop
git checkout -b joshy-port-link-fixes
git cherry-pick 722ead0..3271dbe

This results in a single conflict that can easily be resolved. But it fails to pull in some of the updates made. In particular it fails to update the substrate_io links in the contributing guidelines (CONTRIBUTING.md). I don't understand why that would be the case. I was thinking this would be the correct approach.