search

GitLiveApp / GitLive

GitLive Docs
82 stars 24 forks source link

GitLive shows conflicts in gutter when there are none #83

Closed schar closed 2 years ago

schar commented 2 years ago

My team member made changes to a file. I cherry-picked these changes, making our local copies identical. But GitLive insists that there is now a conflict, flagging the new cherry-picked text in the gutter. The diff shown on mouseover says that there is a deletion and an addition, nonsensically since the + and - are actually identical. Subsequent cherry-pickings do nothing.

nbransby commented 2 years ago

Is it the spacing perhaps? tabs vs spaces?

schar commented 2 years ago

No, they are character-identical. Again, this behavior is observed immediately after cherry-picking my team member's changes. This shouldn't even create a conflict between our local copies, and yet it erroneously does.

nbransby commented 2 years ago

We would need the steps to reproduce to fix this one as we haven't observed this behaviour before. Are you able to share a repository where it's reproducable?

schar commented 2 years ago

Unfortunately I'm not. The repo we're working on is private. Happy to help some other way if possible.

On Aug 27, 2021, at 12:40 PM, Nicholas Bransby-Williams @.***> wrote:

We would need the steps to reproduce to fix this one as we haven't observed this behaviour before. Are you able to share a repository where it's reproducable?

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/GitLiveApp/GitLive/issues/83#issuecomment-907434021, or unsubscribe https://github.com/notifications/unsubscribe-auth/AALTNC4C6RVKP4DETGD7UHTT67S2VANCNFSM5C6BL5MQ.