0

A feature has been added to an old version of our application to satisfy a customer request. Now, this feature has to be added to the current version.

Given that the changes in the feature are quite numerous, are there any tools to facilitate this migration besides cherry-picking commits or merging manually? There is a comprehensive test suite for this application but doing this by hand is time consuming and prone to errors.

Thanks!

Rodrigo López Dato
  • 1,144
  • 6
  • 13

1 Answers1

0

You could still use git-cherry-pick (1). It supports passing a set of commits in the A..B form.

See this answer: https://stackoverflow.com/a/1994491/679227

You could use tags to specify the range more easily, but it could be done with commit hashes as well.

Community
  • 1
  • 1
Haralan Dobrev
  • 7,617
  • 2
  • 48
  • 66
  • In my case this is unnecessary, the commits for the new feature in the old version were squashed into one massive commit which I have to merge manually. – Rodrigo López Dato Mar 20 '14 at 20:37