gitignore not interpreted correctly

[gukohl]

Version info

• OS: macOS 11.3
• Build: 2056

Description

When editing files through Sublime Merge (e.g. Resolve conflicts - accept ours) then gitignore can get misinterpreted and changed file disappears from list of changed files.

Steps to reproduce

Steps to reproduce the behavior:

1. Open a repository that does have changes that are committed locally.
2. Pull from remote origin with a changed file in a way that a conflict gets created. Precondition: this file resides in a folder let's say /js/folder/, and a gitignore file in the root states to exclude: folder/
3. For the file select Resolve conflicts, and select to accept the changes.

Actual behavior

• a message appears that tells like: "a changed file gets disregarded since it is excluded by one of the gitignore rules"
• the file disappears in Sublime Merge from the list of changed files
• git status does not list the changed file
• when modifying and saving the same file e.g. in Sublime Text the file re-occurs in the list of changed files, both using git status command or looking in Sublime Merge. So clearly it is a Sublime Merge bug upon Resolving conflicts.

Expected behavior

The file gets updated and remains in the list of changed files. No message showing in Sublime Merge telling like "a changed file gets disregarded since in it is excluded by one of the gitignore rules".

[stinos]

git status does not list the changed file

If the actual git command git status does not list the file, arguably SM shouldn't either because it normally does what git does

[gukohl]

"normally"

Look into my description, git actually does work as intended. The problem occurs for me only when using SM's Resolve conflicts action.

On 17. May 2021 at 12.39.40, stinos @.***> wrote:

git status does not list the changed file

If the actual git command git status does not list the file, arguably SM shouldn't either because it normally does what git does

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/sublimehq/sublime_merge/issues/1147#issuecomment-842179167, or unsubscribe https://github.com/notifications/unsubscribe-auth/AGI2WRXIFSKRAOWAUBMCR7TTODP5ZANCNFSM45ACUNDQ .