Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix git blame copy script #69

Merged
merged 2 commits into from
Feb 9, 2024
Merged

Fix git blame copy script #69

merged 2 commits into from
Feb 9, 2024

Conversation

yalef
Copy link
Contributor

@yalef yalef commented Feb 8, 2024

There're cases when merge conflict can occur on merge step of git.blame-copy. It can be fixed by adding additional commit command after merge.

@yalef yalef marked this pull request as ready for review February 8, 2024 12:02
@yalef yalef requested review from TheSuperiorStanislav and a team as code owners February 8, 2024 12:02
@yalef yalef requested review from ron8mcr, AndyGreenwell94, NikAzanov, khangnguyen090999 and KhoiCaoSaritasa and removed request for a team February 8, 2024 12:02
@yalef yalef merged commit 51a8369 into main Feb 9, 2024
4 checks passed
@yalef yalef deleted the fix-git-blame-script branch February 9, 2024 03:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TheSuperiorStanislav TheSuperiorStanislav TheSuperiorStanislav approved these changes

@ron8mcr ron8mcr Awaiting requested review from ron8mcr ron8mcr is a code owner automatically assigned from saritasa-nest/saritasa-python-squad-team-leads

@AndyGreenwell94 AndyGreenwell94 Awaiting requested review from AndyGreenwell94 AndyGreenwell94 is a code owner automatically assigned from saritasa-nest/saritasa-python-squad-team-leads

@NikAzanov NikAzanov Awaiting requested review from NikAzanov NikAzanov is a code owner automatically assigned from saritasa-nest/saritasa-python-squad-team-leads

@khangnguyen090999 khangnguyen090999 Awaiting requested review from khangnguyen090999 khangnguyen090999 is a code owner automatically assigned from saritasa-nest/saritasa-python-squad-team-leads

@KhoiCaoSaritasa KhoiCaoSaritasa Awaiting requested review from KhoiCaoSaritasa KhoiCaoSaritasa is a code owner automatically assigned from saritasa-nest/saritasa-python-squad-team-leads

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@yalef @TheSuperiorStanislav