All geek questions in one place

Git combine different file names

Here is my scenario:

I am working on fixing errors in file1the local branch. My colleague is in his own local branch, merging file1in file2in the refactor. He finishes his work and again merges with the owner and pushes. Now file1no longer exists in HEAD.

When I try and try to merge my changes file1back to master, what will happen? Is git smart enough to account for this, or will I have to manually merge my changes?

+3
source share
2 answers

First, you do not merge files; you merge revisions (or rather development lines).

-, git , , , file2 file1, git file2. , "CONFLICT (/)" ( ), .

+4

.... git mv file1 file2 git ? , ... , , 1. . git TIAS , .

+1

Source: https://habr.com/ru/post/1757847/

More articles:


All Articles