Timeline for Git diff not showing the expected changes
Current License: CC BY-SA 4.0
Post Revisions
8 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Aug 13, 2020 at 17:37 | vote | accept | codeluv | ||
| S Aug 12, 2020 at 9:19 | history | suggested | mike |
remove github tag
|
|
| Aug 11, 2020 at 14:19 | review | Suggested edits | |||
| S Aug 12, 2020 at 9:19 | |||||
| Aug 10, 2020 at 12:40 | answer | added | matt | timeline score: 3 | |
| Aug 10, 2020 at 12:37 | comment | added | Romain Valeri | @matt Agreed, and it should be a (concise but useful) answer. | |
| Aug 10, 2020 at 12:36 | comment | added | matt | You could edit all the files before the merge. Now the merge would have conflicts between the edit and the delete, which you could resolve manually, making the edit win over the delete. | |
| Aug 10, 2020 at 12:34 | comment | added | matt | "it should ideally show the changes which states the files are being added" No, that’s not what a merge is or what a diff is. On your branch nothing happened to those files. On master they were deleted. Therefore on a merge they are deleted. No branch added them. | |
| Aug 10, 2020 at 12:29 | history | asked | codeluv | CC BY-SA 4.0 |