I created remote main repo with bunch of files on Github website. Then I created a branch_1.
I cloned branch_1 to 2 different directories, let's say der_1 and dir_2, and delete file_1 from dir_1, then push the changes.
Now, I have 2 local repos which are not synced. What are the commands that I need to execute to force specific repo to be like the other? And if I made changes to the code in dir_2 files, how can I merge the changes from dir_1 only related to the file_1 that was deleted?
I tries 'git merge' in dir_1 and get: error: Merging is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm ' hint: as appropriate to mark resolution and make a commit. fatal: Exiting because of an unresolved conflict.
