CODEWITHSUNDEEP
git
Tristanisginger
Tristanisginger

Reputation: 2683

Where would Git pull make changes if a folder has been renamed and then recreated?

I had a folder tristanisanoob that i renamed to tristanisanoob-2019 I then unzipped file that recreated folder tristanisanoob

If I git pull changes made remotely to files in tristanisanoob will be applied to which local folder?

Upvotes: 1

Views: 448

Answers (1)

Schwern
Schwern

Reputation: 164859

git pull origin master is simply a git fetch origin to update your copy of the remote, plus a git merge origin/master. So the question is what happens when you merge?

As mentioned by Rudedog, Git does not track folders, only their files. The changes will be applied to files in tristanisanoob and there will likely be conflicts.

You can try this out by cloning your own repository and playing around.

git clone /path/to/my/repo

Upvotes: 1

Related Questions