enter image description here
Branch A and branch B own file C, then delete C on branch A and then integ to branch B, then C on B is also deleted, then, branch A re-adds file C, then integ to branch B again but The C file of branch B still does not exist and is still deleted.
Branch A and branch B own file C, then delete C on branch A and then integ to branch B, then C on B is also deleted, then, branch A re-adds file C, then integ to branch B again but The C file of branch B still does not exist and is still deleted.
Why?
How to solve？
New contributor
ggwise is a new contributor to this site. Take care in asking for clarification, commenting, and answering.
Check out our Code of Conduct.