Skip to main content

You are not logged in. Your edit will be placed in a queue until it is peer reviewed.

We welcome edits that make the post easier to understand and more valuable for readers. Because community members review edits, please try to make the post substantially better than how you found it, for example, by fixing grammar or adding additional resources and hyperlinks.

1
  • 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. Commented May 5, 2023 at 18:38