Closed rothmichaels closed 9 years ago
I'm realizing now that this pull request includes some submodule updates you may not want in there.
Any thoughts on this issue? Would you like me to submit a new pull request that just takes the fix from de46f7e?
Could you please take a look at this? live-mp-new-basic-save-buffer
seems to break edify
(and probably other things that it shouldn't be trying to save).
I have been using this patch often for the past year with no problem—could continue doing so but it would be nice to have merged into overtone/master.
Is there anything that you do that this change breaks? If there is, let me know and I will look into another way of solving this that doesn't break anything else.
Since this pull request is pretty old, the commit history is a little messy from keeping it up to date with your development. If you want a cleaner branch to merge, checkout rothmichaels/magit-ediff-bug-clean.
Thanks!
Thanks to #198 I have a fresh perspective on this pull request. I'm closing this one as it was not the best way to address the other issues I was having with live-mp-new-basic-save-buffer
.
Using magit-ediff I noticed an issue saving the merged file. I would get the following error:
This error was preventing the buffer from saving the merge correctly.
I was able to narrow the problem down to monkey-patch.el, but I don't see what is going on in that file and so am not sure where the issue is.
P.S.: Added a commit I made with updated git-pack I was using in debugging.