tags 542709 - moreinfo
# I wish I had an explanation. :)
severity 542709 wishlist
submitter 542709 !
quit
Ximin Luo wrote:
> I can no longer reproduce the bug on my git version, 1.7.2.3.
I'm lowering the severity since it seems it's unreproducible.
> (sorry if you wanted me to test an earlier v
On 19/02/11 22:54, Jonathan Nieder wrote:
> Drat. :)
>
>> I'll try to reproduce this with the latest version of git.
>
I can no longer reproduce the bug on my git version, 1.7.2.3.
> Thanks. The thing to look for is whether "git diff-files" shows
> anything after such a conflicted rebase.
>
>
Hi again,
Ximin Luo wrote:
> I'm pretty sure I was on ext4, my normal
> filesystem, with no sshfs or anything like that.
Drat. :)
> I'll try to reproduce this with the latest version of git.
Thanks. The thing to look for is whether "git diff-files" shows
anything after such a conflicted rebas
On 19/02/11 03:09, Jonathan Nieder wrote:
> tags 542709 + moreinfo
> quit
>
> Jonathan Nieder wrote:
>> Ximin Luo wrote:
>
>>> when a conflict occurs during git-rebase, we are told to fix it,
>>> tell git that we have done this with git-add, and then continue the
>>> rebase with git rebase --cont
tags 542709 + moreinfo
quit
Jonathan Nieder wrote:
> Ximin Luo wrote:
>> when a conflict occurs during git-rebase, we are told to fix it,
>> tell git that we have done this with git-add, and then continue the
>> rebase with git rebase --continue. both the manual and the program
>> say this.
>>
>>
Hi again,
Ximin Luo wrote:
> when a conflict occurs during git-rebase, we are told to fix it, tell git that
> we have done this with git-add, and then continue the rebase with git rebase
> --continue. both the manual and the program say this.
>
> however, this doesn't actually work.
I forgot to
tags 542709 - moreinfo
quit
Jonathan Nieder wrote:
> I’ll try to reproduce this and let you
> know when I have more questions.
I wasn’t able to reproduce it, unfortunately. I think my random
guesses were barking up the wrong tree. :)
Worse, the next upload will treat the symptoms, via commit v
Uli Schlachter wrote:
> doxygen/manpages/
> doxygen/manpages.cfg
>
> oflog/include/dcmtk/oflog/config/
> oflog/include/dcmtk/oflog/config.h
>
> I don't know if any of these were part of the conflict, but this might well be
> possible
The relevant code in git was recently touched to solve a myst
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256
Am 16.05.2010 22:58, Jonathan Nieder wrote:
> found 542709 git-core/1:1.6.5-1
> quit
>
> Uli Schlachter wrote:
>
>> this happened to me the day I wrote the mail to this bug (google found this
>> bug
>> report while I was looking for a solution).
>
found 542709 git-core/1:1.6.5-1
quit
Uli Schlachter wrote:
> this happened to me the day I wrote the mail to this bug (google found this
> bug
> report while I was looking for a solution).
[...]
> /var/log/dpkg.log.3.gz:2010-02-08 15:51:57 status installed git-core
> 1:1.6.6.1-1
> /var/log/dpkg
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256
Am 15.05.2010 21:36, Jonathan Nieder wrote:
> Uli, do you know whether you were using a release candidate when you
> experienced this problem? If you remember when that was,
> /var/log/dpkg.log would tell. I am asking because this would confirm
> w
reassign 542709 git git/1:1.6.3.3-2
quit
Hi,
On 18 November 2009, Uli Schlachter wrote:
> I just saw something like this, too.
>
> After git rebase I got tons of conflicts, I fixed them up and "git add"'ed
> each
> file, but git rebase --continue just showed me the message the message above.
>
12 matches
Mail list logo
