# Rebase vs Rebase-I differences

1 messages from 2010-10-21 to 2010-10-21. Participants: Jan Engelhardt.
Thread: https://gitlist.dev/t/25502

## Jan Engelhardt, 2010-10-21 15:19

Subject: Rebase vs Rebase-I differences
Message-ID: <alpine.LNX.2.01.1010211717050.10096@obet.zrqbmnf.qr>
URL: https://gitlist.dev/e/alpine.LNX.2.01.1010211717050.10096%40obet.zrqbmnf.qr

```
Hi,


small bug observed in git 1.7.1: when one does `git rebase otherbranch` 
and there is a conflict, the conflict markers won't be showing the SHA 
id. In contrast to that, they do appear when using `git rebase -i 
otherbranch`.

<<<<<<<
this
=======
that
>>>>>>> 75a435a... commit message

```