{"thread":{"id":"38671","subject":"[Feature request] Commit flag to \"ignore\" conflicting/unmerged changes","startedAt":"2015-03-01T00:43:32Z","lastAt":"2015-03-01T00:43:32Z","messageCount":1,"participants":["William Di Luigi"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"256787","messageId":"CAJNpUg5RdXBxSGiZoSVHNZK84VbztTARqRXy+v0y0_bSQZ4c4A@mail.gmail.com","threadId":"38671","inReplyTo":null,"subject":"[Feature request] Commit flag to \"ignore\" conflicting/unmerged changes","fromName":"William Di Luigi","fromEmail":"williamdiluigi@gmail.com","sentAt":"2015-03-01T00:43:32Z","receivedAt":"2015-03-01T00:43:32Z","isPatch":false,"sender":{"key":"williamdiluigi@gmail.com","avatar":null},"body":"Hi, the scenario is as follows: I'm working on a repo where only\n\"rebase\" is used and never \"merge\" (which can arguably be a bad\nthing). Anyway, I worked on a separate branch for some time and now I\nneed to integrate all the changes introduces by \"master\" (and prepare\nsome \"fixup\" commits that will be used when the branch will be finally\nrebased).\n\nSo I call `git merge --squash --no-commit master` and some conflicts\ncome out. Suppose that I now have 100 files automatically merged and\nstaged by git, and 10 files which are conflicting (\"both modified\")\nand I'll need to fix by hand.\n\nThe point is: I would like to commit *all* the changes that git\nsuccessfully merged (*including* partial changes inside conflicting\nfiles). After that, I will start to work on the conflicts (which will\nbe resolved with several \"fixup\" commits).\n\nFor the moment, the only (quite tedious) way I've found to do it is this:\n1. `git reset HEAD` for each of the 10 conflicting files\n2. `git add -p` and select only the non-conflicted hunks\n3. `git commit` let's call this commit \"temp\"\n\nThen, I can finally work with *just* the conflicts. When I will rebase\non master, I will simply discard the \"temp\" commit and I will apply\nevery fixup that piled up.\n\nThe feature I'm requesting is something like a flag that allows `git\ncommit` to work anyway by \"ignoring\" unmerged hunks (which can then be\ndowngraded to unstaged changes).\n\nWhat do you think?\n\nRegards,\nWilliam\n"}]}