Rodrigo Leitão

Here it is: #6879

Is there a reason why @iCrawl ?

Ah ye, but it’s not pointless, it fucks with dependabot and spams the version tree

Not sure since I'm not too familiar with Git itself but I will try to reproduce that and will let you know if I manage to succeed

Can confirm the issue does happen when executing `git pull`. What would be the best way to go on about this issue then? 

 Here I ran the command three times: the first time the merge conflict showed up as resolved on GitHub Desktop, the second time it was unresolved (I undid the...

When the merge conflict has been resolved, GitHub desktop will show a green tick next to the file saying "Resolved" when you hover it. The terminal displays what I showed...

Well it doesn’t let me stash either because of the “merge conflict” it thinks I have. Where would be the appropriate place to report this? I’m not sure how to...

But then why doesn’t git detect that the conflict was resolved? Is it because it needs to be committed or is there a way to resolve without committing? Also the...

No problem! I actually don't use git at all so I never noticed the bug you mentioned but I understand what you meant. If you want you can feel free...