GeekPeek
GeekPeek

Reputation: 1767

how to merge local folder with git repository?

I have a folder that is linked with GIT to other people. However, I copied this folder to make sure I always have a back-up in case merging goes wrong in some way. I accidentally started working on this copied folder though, instead of the one that is connected through GIT. Is there a way to merge this local folder back into the other folder, so I can push my work to remote?

Thanks.

Upvotes: 0

Views: 1452

Answers (1)

Alexander Tokarev
Alexander Tokarev

Reputation: 2763

Do you have a .git directory in your copied folder? If so - it is just another clone of the git repository, and you can push the changes directly from it.

Or, if you don't have .git folder in your copied folder - just copy it here from your original folder.

Upvotes: 2

Related Questions