{"thread":{"id":"52864","subject":"Feature request: ability to pass merge strategy options to 'git checkout --merge'","startedAt":"2020-02-21T18:33:26Z","lastAt":"2020-02-21T18:33:26Z","messageCount":1,"participants":["Zachary Santer"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"392275","messageId":"CABkLJUKaMwT+_AeUo+gdMF5ELEfZzxRqJ_dDhUpdXp2dGeE=8Q@mail.gmail.com","threadId":"52864","inReplyTo":null,"subject":"Feature request: ability to pass merge strategy options to 'git checkout --merge'","fromName":"Zachary Santer","fromEmail":"zsanter@gmail.com","sentAt":"2020-02-21T18:33:10Z","receivedAt":"2020-02-21T18:33:26Z","isPatch":false,"sender":{"key":"zsanter@gmail.com","avatar":null},"body":"Perhaps using a command like:\ngit checkout --merge=\"-s recursive -Xpatience -Xignore-all-space\"\n[<tree-ish>] [--] <pathspec>…\nfor instance.\n\nI'm merging two long-lived branches that I had no hand in developing.\nI used the following command to get started:\ngit merge -s recursive -Xpatience -Xignore-all-space --no-commit <other branch>\n\nI need to be able to quickly ensure that it is not the case that both\nbranches implement the same behavior in different sections of the same\nfile. In the case of a file that merged without conflicts, I've been\ndoing the following, in order to use my merge tool:\ngit checkout --merge <file>\ngit mergetool <file>\ngit add <file>\n\nThis allows me to quickly look over what each side of the merge added.\nHowever, it's also creating merge conflicts where there were none\nresulting from the original merge.\n\nOn the other hand, it would be more efficient from the user's\nperspective to be allowed to run mergetool on a file without merge\nconflicts from the get-go.\n\nStill, this would undoubtedly be a useful feature in use cases besides my own.\n\nThank you,\nZachary Santer\n"}]}