Daily Shaarli
February 9, 2020
[fiction] From C code with a lot of bugs to Rust with improvments
Great metaphores :)
git merge-base branch1 branch2 will find the common ancestor commit of two branches.
Tip : check that only one commit is applied out of each command
git log branch1..common
git log branch2..common
- Cherry-pick the fix commit in a new branch (based on a common ancestor of the 2 branches) which will be then merged into them.
- Partial fix will be the same technique but the merge will be reverted in the feature branch before merging the feature branch in the master (see this)
Récap en français du Warrior du Dimanche.
But the question seems uneccessary : yes RSS give content for free, but you can truncate the content and only give an overview. If you want to make money with it, install a paywall...
(via Warrior Du Dimanche)