{"thread":{"id":"60934","subject":"Enhancement: `git pull` fails with merge conflict even if the local copy is modified in the same manner","startedAt":"2024-02-16T08:43:32Z","lastAt":"2024-02-16T08:43:32Z","messageCount":1,"participants":["Xuancong Wang"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"488787","messageId":"CA+prNOo56SkNohZ6qgh1TLsDxGr-OTbeP0FhzrJK80Hr4SzKyA@mail.gmail.com","threadId":"60934","inReplyTo":null,"subject":"Enhancement: `git pull` fails with merge conflict even if the local copy is modified in the same manner","fromName":"Xuancong Wang","fromEmail":"xuancong84@gmail.com","sentAt":"2024-02-16T08:43:18Z","receivedAt":"2024-02-16T08:43:32Z","isPatch":false,"sender":{"key":"xuancong84@gmail.com","avatar":null},"body":"Dear Git developers,\n\nI would like to report a bug or defect in git.\n\nI am in charge of running a real-life study. Very often, I copy the\nsource files to the working folder and test running the pipeline to\nmake sure that it does not crash. At the same time, I push my code to\nmy branch and create a merge request. After my branch gets merged to\nthe master branch (which takes some time), I run `git pull -f` in the\nworking folder (which always contains the latest version of my code\nmanually copied in). This pull operation will fail with conflict\nbecause the source file gets modified both locally and in the updated\nrepository, even though the final file content is the same.\n\nSo my suggestion is that would you make Git a bit smarter so that if\nthe same file gets modified in the same way both locally and remotely,\nwould you allow the pull operation to pass? Thanks!\n\nBest regards,\nXuancong\n"}]}