[GH-ISSUE #95] Conflicting authorship files #41

New issue

Closed

opened 2026-03-02 04:11:25 +03:00 by kerem · 1 comment

kerem commented

2026-03-02 04:11:25 +03:00

Owner

Originally created by @AtnesNess on GitHub (Oct 7, 2025).
Original GitHub issue: https://github.com/git-ai-project/git-ai/issues/95

Originally assigned to: @svarlamov on GitHub.

Description:

Git-ai blame doesn't work properly in the fresh clone when 2 remote branches have changes in the same file.

Steps to reproduce

Create 2 clones of a repository
Create one branch in both of the clones with different names
Modify the same file with AI in both of the clones and commit changes
Push first branch to remote
Push second branch to remote
Create another clone of the repo
Fetch both branches from remote

Observed behaviour

First branch doesn't show correct git-ai blame <file>
git notes --ref ai show <commit sha> doesn't work for latest commit in first branch
git-ai blame <file> and git notes work correctly in second branch.
Fetching git notes refs in first clone introduces conflict

  atnes-test-repo git:(my-test-1) git fetch origin refs/notes/ai:refs/notes/ai
From bitbucket.org:atlassian/atnes-test-repo
 ! [rejected]        refs/notes/ai -> refs/notes/ai  (non-fast-forward)

Originally created by @AtnesNess on GitHub (Oct 7, 2025). Original GitHub issue: https://github.com/git-ai-project/git-ai/issues/95 Originally assigned to: @svarlamov on GitHub. ### Description: `Git-ai blame` doesn't work properly in the fresh clone when 2 remote branches have changes in the same file. ### Steps to reproduce - Create 2 clones of a repository - Create one branch in both of the clones with different names - Modify the same file with AI in both of the clones and commit changes - Push first branch to remote - Push second branch to remote - Create another clone of the repo - Fetch both branches from remote ### Observed behaviour - First branch doesn't show correct `git-ai blame <file>` - `git notes --ref ai show <commit sha>` doesn't work for latest commit in first branch - `git-ai blame <file>` and `git notes` work correctly in second branch. - Fetching git notes refs in first clone introduces conflict ``` atnes-test-repo git:(my-test-1) git fetch origin refs/notes/ai:refs/notes/ai From bitbucket.org:atlassian/atnes-test-repo ! [rejected] refs/notes/ai -> refs/notes/ai (non-fast-forward) ```

kerem

2026-03-02 04:11:25 +03:00

closed this issue
added the
bug
label

kerem commented

2026-03-02 04:11:26 +03:00

Author

Owner

@svarlamov commented on GitHub (Oct 8, 2025):

Thank you so much @AtnesNess for the thorough and complete replication instructions -- this one is a great catch! Added some color on what was going on and why in the PR #98

@svarlamov commented on GitHub (Oct 8, 2025): Thank you so much @AtnesNess for the thorough and complete replication instructions -- this one is a great catch! Added some color on what was going on and why in the PR #98

kerem referenced this issue

2026-03-02 04:12:59 +03:00

[PR #41] [MERGED] Bug/fix install hooks windows #221