To pick up changes from one branch and apply them to another branch without using git cherry-pick or any commit-related commands, you can use the git diff and git apply commands. Here’s a step-by-step guide on how to do this:
Switch to the branch with the changes:
git checkout branch-with-changesGenerate the diff file:
git diff > changes.diff
| # FOR BUSY JOBS | |
| # take the process_id from the /busy page in sidekiq and kill the longest running one. | |
| workers = Sidekiq::Workers.new | |
| long_process_id = 'integration.3:4:71111aaa111' # Eg: 'integration.3:4:71d1d7f4ef5a' | |
| workers.each do |process_id, thread_id, work| | |
| process = Sidekiq::Process.new('identity' => process_id) | |
| process.stop! if process_id == long_process_id | |
| end | |
| # FOR SCHEDULED JOBS |
https://docs.github.com/en/authentication/managing-commit-signature-verification/generating-a-new-gpg-key Git GPG Setup for macOS Packages Install gnupg brew install gpg Install passphrase entry dialogs brew install pinentry-mac Generate a key Follow instructions, select default via Enter if unsure.
| -----BEGIN PGP PUBLIC KEY BLOCK----- | |
| mDMEZRpcKBYJKwYBBAHaRw8BAQdAmFRh8xwE/auGgZhORGN7ksoG7bM1XBDZphSh | |
| cLU+SZi0R0V2YWxkYXMgR3J1ZHppbnNrYXMgKFdvcmsgcmVsYXRlZCBHUEcpIDxl | |
| dmFsZGFzLmdydWR6aW5za2FzQHZpbnRlZC5jb20+iJMEExYKADsWIQTsIexNmgDM | |
| Oh8fVcPAUmrgMWv9eAUCZRpcKAIbAwULCQgHAgIiAgYVCgkICwIEFgIDAQIeBwIX | |
| gAAKCRDAUmrgMWv9eBsSAQDU599XYABlZ8F0qsx5FocMcU9xiGmzOeHH1LPXNKS6 | |
| wwD9EAqMOghFbc7dxR3tHvOpecwAjmaoB3xZZvbiEEWG3w+4OARlGlwoEgorBgEE | |
| AZdVAQUBAQdAK+7Pdy49yOw6LpTM3pGUDnqvo1PxnYTq+BR2FqhmvEIDAQgHiHgE | |
| GBYKACAWIQTsIexNmgDMOh8fVcPAUmrgMWv9eAUCZRpcKAIbDAAKCRDAUmrgMWv9 |
| # Download and install the public signing key: | |
| wget -qO - https://artifacts.elastic.co/GPG-KEY-elasticsearch | sudo gpg --dearmor -o /usr/share/keyrings/elasticsearch-keyring.gpg | |
| # Install the apt-transport-https packages | |
| sudo apt-get install apt-transport-https |
1) Filter Table
Filter is default table for iptables. So, if you don’t define you own table, you’ll be using filter table. Iptables’s filter table has the following built-in chains.
| # sudo gem install bson | |
| # sudo gem install bson_ext | |
| # sudo gem install yajl-ruby | |
| # sudo gem install json | |
| # sudo gem install msgpack | |
| require 'rubygems' | |
| require 'benchmark' | |
| require 'yaml' | |
| require 'bson' |
ganked from unreadable scribd doc here: http://cleancoder.posterous.com/what-killed-waterfall-could-kill-agile
Robert C. Martin
20 Nov, 2010
In 1970 a software engineer named Dr. Winston W. Royce wrote a seminal paper entitled Managing the Development of Large Software Systems. This paper described the software process that Royce felt was appropriate for large-scale systems. As a designer for the Aerospace industry, he was uniquely qualified.
He began the paper by setting up a straw-man process to knock down. He described this naïve process as “grandiose”. He depicted it with a simple diagram on an early page of his paper. Then the paper methodically tears this “grandiose” process apart. In the end, Royce proposed a far more nuanced and insightful approach, leaving the reader to giggle at the silliness of the “grandiose” model.
| # activerecord-3.0.0/lib/active_record/connection_adapters/mysql_adapter.rb | |
| # Maps logical Rails types to MySQL-specific data types. | |
| def type_to_sql(type, limit = nil, precision = nil, scale = nil) | |
| return super unless type.to_s == 'integer' | |
| case limit | |
| when 1; 'tinyint' | |
| when 2; 'smallint' | |
| when 3; 'mediumint' | |
| when nil, 4, 11; 'int(11)' # compatibility with MySQL default |