Skip to content

Commit

Permalink
handle merge strategy for requirements files via .gitattributes closes
Browse files Browse the repository at this point in the history
  • Loading branch information
fzumstein committed Aug 24, 2024
1 parent ac14852 commit 5ee2f00
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
requirements.in merge=ours
requirements*.txt merge=ours

0 comments on commit 5ee2f00

Please sign in to comment.