Re: Git is not recognizing some merge conflicts and just accepting incoming master version
- From
Johannes Sixt <j6t@kdbg.org>
- Date
- Mar 15, 2024, 07:24 UTC
- Message-ID
- <606fe3fa-a5a0-4d35-a4a0-59521043dde4@kdbg.org>
- In-Reply-To
- <CA+XMOBuK1_BNqgQRfCne8dVXKGPt+iQ9wt4iZqz0PgEqZ5UCtg@mail.gmail.com>
Am 14.03.24 um 11:30 schrieb Kai:
Show 6 quoted lines
> I am encountering strange behavior when trying to merge master into a > feature branch. Trying with guis VScode and Gitkraken, both are not > displaying all conflicts in the files correctly and are just accepting > some changes from master which are conflicts and break the code. > > I am including two example files as well as screenshots.
No files were included in this message. Don't post screenshots when the content can also be represented as text.
That said, a conflict needs three files, not two: the base version, their version, and our version. But better than file attachments would be to just paste the relevant parts into the message (if you know what the relevant parts are and that other parts are not relevant).
Show 6 quoted lines
> In the first example, the conflict of the UseFormReturn type changing > between the two versions of the file is not being recognized. > > In the second example the useForm hook is completely different between > master and the feature branch called hook-form, but no conflict is > displayed.
These descriptions sound like the conflicts are of semantic kind. Git can't help in such cases. Git can only detect textual conflicts, that is, when both sides modify the same or adjacent lines of code in different ways.
-- Hannes