2

Due to addition machine dependent changes, folders got created in latest release

Before:

A/B/C/file1.txt

After:

A/B/C/{Machine}/file1.txt

I got a fix for latest version i.e

{A/B/C/{Machine}/file1.txt}

How can I cherry pick latest to before version?

Paolo
  • 21,270
  • 6
  • 38
  • 69
Vij
  • 63
  • 4
  • 1
    What is wrong with a simple merge? If you properly renamed the file, git should be able to resolve it. – Serge Feb 05 '20 at 11:52
  • I did a rename in patch file and merged it. For me it was only a file, but I thought there should be a generalized way for edits in multiple files. – Vij Feb 06 '20 at 09:45
  • sure, `git merge` is the generalized way for doing it. 1) create a branch before rename, 2) modify files, 3) merge with master, which has renames. it should work. – Serge Feb 06 '20 at 11:28

0 Answers0