Timeline for TortoiseGit: How to show files with differences between branches before merging
Current License: CC BY-SA 4.0
3 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| May 5, 2023 at 18:38 | comment | added | Frank Thomas | this is true if you are the only developer on the branch (since its local-only data), so you are comparing to what the file was prior to your changes. it won't see changes that have happened on the branch upstream, which is where conflicts come from. you can't conflict with yourself in your local unless you do some really odd stuff with squashes, etc. | |
| May 5, 2023 at 18:37 | vote | accept | Dan D. | ||
| May 5, 2023 at 18:22 | history | answered | MrTux | CC BY-SA 4.0 |