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 --continue. both the manual and the program >>> say this. >>> >>> however, this doesn't actually work. >> >> I forgot to ask a pretty fundamental question --- what filesystem do >> you use? > > For future reference: [1] explains what reminded me to ask. > > [1] http://thread.gmane.org/gmane.comp.file-systems.fuse.sshfs/1136/focus=9970
Hey, thanks for finding me again. I'm pretty sure I was on ext4, my normal filesystem, with no sshfs or anything like that. I'll try to reproduce this with the latest version of git. -- GPG: 4096R/5FBBDBCE -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
