FilesExpand file tree

main

/

.gitconfig

Copy path

Blame

More file actions

Blame

More file actions

Latest commit

 

History

History

History

5 lines (5 loc) · 283 Bytes

main

/

.gitconfig

Copy path

Top

File metadata and controls

• Code
• Blame

5 lines (5 loc) · 283 Bytes

Raw

Copy raw file

Download raw file

Open symbols panel

Edit and raw actions

1

2

3

4

5

[merge "ours"]

# define merge driver "ours" that will do nothing which will make git

# accept the file from the branch the we rebase onto as final version, ignoring local changes.

# https://git-scm.com/docs/gitattributes#_defining_a_custom_merge_driver

driver = true