Community
Participate
Working Groups
Created attachment 250319 [details] reproduction git repository Cherry-picking a commit where the diff introduced by this commit is about file that are renamed/moved on the destination branch raises a conflict. Using regular git (tested with GitExtension on Windows) works Using the attached git repository, my problem is reproducible. I have two branches : master and featureBranch featureBranch contains two commits, but I onl want the first one in my master branch master branch : in this branch, I moved the AClass.java file. When master is checked out - try to cherry-pick the commit c9148ee0ae31ccd5c371821371c65cfcc0e599fc "commit I want to cherry-pick" - A conflict is raised for AClass.java (in src folder). I would have expected the cherry-pick to be aware that the file was moved to 'other.packagelocation package' and therefore apply it without any problem (or maybe some conflict based on the content of the file, rather than its name/presence) When using regular Git and the same actions, the cherrypick is accepted (without conflict)
