Git：合并复制的目录时停止自动合并

Question

I have a master branch, and a "newfeature" branch.

In my newfeature branch, I copied directory A, calling the new folder Directory B.

I then deleted directory A in "newfeature", just to make sure I wouldn't accidentally change anything there, as my new feature was to be in Directory B.

I did some work in "newfeature", and committed it.

Then, from master, I tried to merge in "newfeature" (git merge newfeature).

However, git merges my changed files in Directory B (from "newfeature") with my files in Directory A (in "master"), and I'm just left with a Directory B. The message is like this:

Auto-merging B/somefile.php

How can I retain both Directory A, and Directory B, when merging?

Answer 1

Are you interested in preserving history for the directory you copied ? If not, see below: When you copied directory A as directory B in new branch, you shouldn't run "git cp". Just do a "cp". check the following sequence of commands I ran to achieve this.

ls -al
  cp -rf data-trial test
  mkdir test; sudo cp -rf data-trial/* test/
  cd test
  cp -rf data-trial/.git .
  cp -rf data-trial/.git .
  git branch
  git checkout -b test2
  cp -rf tmp tmp2
  git add tmp2
  git commit 
  git log
  git branch
  git checkout feature/aws
  cd tmp
  ls -al
  touch foo
  vim foo
  git status
  git add foo
  git commit
  git log
  git branch
  git checkout test2
  sudo git checkout test2
  git merge feature/aws
  sudo git merge feature/aws
  ls -al
  pwd
  cd ..
  ls -al
  ls -al tmp
  ls -al tmp2