My question is this: I'm in a branch trying to merge my branch master. But git is ignoring some files when the merge is given.
How do you force it?
Branch removing files from master branch
1
asked by anonymous 28.04.2016 / 20:39
1 answer
0
Well, I would do it like this:
git checkout branch_que_quero_dar_o_merge
git checkout branch_em_que_quero_arquivos -- pasta/ou/arquivos
So, if merge is deleting some file, you can simply get them back from the other branch by checking with the other specified branch.
28.04.2016 / 21:12