A
A
Alexander2017-05-30 14:52:11
linux
Alexander, 2017-05-30 14:52:11

Why are ignored files removed when I merge?

There is a repository (locally) - the entire site on WordPress. Over time, the engine files were removed from the index and added to gitignore. All this is on the development branch. I merge the master branch with the development branch - only the files that git tracks are left in the workspace. But I need everything) How do I decide that git does not touch files outside its index and that are added to gitignore during merges?

Answer the question

In order to leave comments, you need to log in

1 answer(s)
V
Victor, 2017-05-30
@sanok_ps

The fact is that they were deleted in the development folder and Git, when merged, performs the same action in the master branch.
You need to add them back to the folder, but so that they are immediately ignored, then Git will not do anything with them.

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question