Branch A has commits (X,Y) that also need to be in Branch B. The cherry-pick operations should be done in the same chronological order that the commits appear in Branch A.
cherry-pick does support a range of commits, but if you have merge commits in that range, it gets really complicated
git checkout branch-B
git cherry-pick X
git cherry-pick Y
| # frozen_string_literal: true | |
| module Validation | |
| def self.validate_title(title) | |
| stripped = title.strip | |
| return stripped if stripped.length < 30 | |
| raise 'Title should be less than 30 chars.' if stripped.length > 30 | |
| end |
| # frozen_string_literal: true | |
| require 'uri' | |
| require 'net/http' | |
| require 'optparse' | |
| # helpers methods for URLAnalyzer class | |
| module AnalyzerUtils | |
| def self.bytes_to_kilobytes(bytes) | |
| (bytes.to_f / 1024).round(2) |
| # frozen_string_literal: true | |
| # enhanced improvement for basic string class :) | |
| class String | |
| def i? | |
| !!(self =~ /^\d+$/) | |
| end | |
| end | |
| # LCD class for converting integers into LCD-like digits |