{"thread":{"id":"58654","subject":"Commit amend during a merge conflict","startedAt":"2022-10-20T08:25:19Z","lastAt":"2022-10-20T08:25:19Z","messageCount":1,"participants":["Matan Wiesner"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"465282","messageId":"CA+vqH8+zCbyF39ycKv-4=t+U2hOx7t3w5EB-+bSeyH9HdfsjMQ@mail.gmail.com","threadId":"58654","inReplyTo":null,"subject":"Commit amend during a merge conflict","fromName":"Matan Wiesner","fromEmail":"matanwis@gmail.com","sentAt":"2022-10-20T08:24:53Z","receivedAt":"2022-10-20T08:25:19Z","isPatch":false,"sender":{"key":"matanwis@gmail.com","avatar":null},"body":"Hi\nWhen I use git to edit a long change of commit there are two scenarios I meet:\n1. edit existing commit - in this case I do \"git rebase -i\", stop in\nmy commit, them run \"git commit --amend\" and them run \"git rebase\n--continue\"\n2. rebase and solve conflicts - when I rebase (for example on top of\nmain branch) and meet a conflict : \"cannot apply commit A\" I need to\nsolve these conflict, then run \"git rebase --continue\", it easy to\nconfuse and run \"git commit --amend\" and in this scenario, that leads\nto commit A and the commit before A to be squashed.\nMy claim is, that there is no scenario that the user actually wants to\ncommit (and not run \"rebase --continue\") when there are merge\nconflicts, therefore git should block this option.\n\nAs a reference to support my claim, I link 2 stack overflow threads of\nusers that did this mistake\nhttps://stackoverflow.com/questions/41439424/i-amended-instead-of-resolving-conflict-in-interactive-rebase-can-i-undo\nhttps://stackoverflow.com/questions/11116572/git-commit-during-git-rebase-what-really-happens\n\n\nWDYT?\n"}]}