After merge files still outdated

Question

I have two branches

dev
sprint5

when I merge form dev (after solving some bugs and adding features) into sprint5 IDE show me strings.xml file as conflict file, so I solved conflicts manually and click applied, and merge is done

but when I compare dev with sprint5 (this current checked one) I found a file File.kt its code is sprint5 version not dev version (although IDE did not show it to me when merge)

[Note]

File.kt did not changed at sprint5 branch

Is File.kt being ignored via `. gitignore'? – GoodDeeds May 12 '20 at 20:28 — GoodDeeds, May 12 '20 at 20:28
i checked `.gitignore` it is not added there. – Mahmoud Mabrok May 13 '20 at 11:43 — Mahmoud Mabrok, May 13 '20 at 11:43

score 1 · Answer 1 · answered May 13 '20 at 13:30

1

Maybe file.kt wasn't staged by accident, try to stage/add file and then re-merge.

Steps:

checkout dev.
add/stage file.kt
commit.
checkout sprint5
merge dev into sprint5

answered May 13 '20 at 13:30

Mostafa Yehya

49
3

After merge files still outdated

1 Answers1