help-gnu-emacs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: A problem with Magit


From: Marcin Borkowski
Subject: Re: A problem with Magit
Date: Sun, 26 Jul 2015 21:21:36 +0200

Hi there,

I found the culprit: it was a good ol'editing conflict.  The two commits
I wanted to swap involved edits too close to each other.

Best,
mb


On 2015-07-26, at 12:00, Marcin Borkowski <mbork@mbork.pl> wrote:

> Hi all,
>
> I tried interactive rebase in Magit today, and ran into this (in the
> magit-process buffer):
>
> ,----
> | Waiting for Emacs...
> | *ERROR*: Canceled by user
> | Could not execute editor
> `----
>
> All I did was to swap to commits, so theoretically this should run
> smoothly.
>
> The only Magit-relevant setting in my init.el is (setq
> magit-revert-buffers nil).
>
> However, there is one (potential) problem: when I start Magit, I see
> this:
>
> ,----
> | Error (magit): Magit requires Git >= 1.9.4, you are using 1.9.1.
> `----
>
> I'm not sure whether this is relevant, but I include it here just in
> case.  (Of course, I'm going to upgrade my Ubuntu ASAP.)
>
> Where should I look for solution?
>
> Best,


-- 
Marcin Borkowski
http://octd.wmi.amu.edu.pl/en/Marcin_Borkowski
Faculty of Mathematics and Computer Science
Adam Mickiewicz University



reply via email to

[Prev in Thread] Current Thread [Next in Thread]