When merging conflicts, don't show line number for a deleted line
Steps to reproduce:
1. Clone this GitHub repository: https://github.com/TysonMN/GitKrakenEditVsDeleteLineBug
2. Checkout the branch called branch
3. Under “LOCAL”, right-click the branch called main
4. Select “Rebase branch onto main”
5. Select the conflicted file
6. Observe the diff B on right side and the final diff below both before and after selecting all the changes from B.
Expected behavior:
Diff B and the final diff show line 2 containing “Line2” as deleted and the line containing “Line3” as being on line 2.
Actual behavior:
Diff B and the final diff show line 2 containing “Line2” as replaced by an empty line and the line containing “Line3” as being on line 3. However, when looking at the diff after the rebase is complete, the expected behavior is observed.
See also that repository, which contains screenshot images
Comments: 2
-
27 Jul, '21
Tyson WilliamsWhen I created this suggestion, I set the title to "When merging conflicts, show line numbers correctly when there is a deleted line". The current tittle of this suggestion is "When merging conflicts, show line number for a deleted line". The new title is not correct. The problem is that the current behavior DOES SHOW a line number for a deleted line but this suggestion is that such a line number SHOULD NOT BE SHOWN. I don't know who changed the title, and I don't see a way for me to fix the title. Clearly someone didn't like my original title. How about using the following title instead: "When merging conflicts, don't show line number for a deleted line". The difference is the addition of "don't".
-
27 Jul, '21
Giacomo Zanotti AdminThank you for the clarification Tyson.