Here's my scenario:
I'm working on fixing bugs in file1
in a local branch. My coworker is in his own local branch, merging file1
into file2
in a refactor. He finishes his work and merges back into master and pushes. Now file1
no longer exists in the HEAD.
When I do a pull and try to merge my file1
changes back into master, what will happen? Is git smart enough to account for this or will I have to merge my changes manually?