brennen
/
neveragaindottech.github.io
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 1 Wiki Activity
Source files for the neveragain.tech site
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
275 Commits
6 Branches
1.4 MiB
Branch: set-merge-union-on-index
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from 'set-merge-union-on-index'
${ noResults }
neveragaindottech.github.io/.gitattributes

1 line
25 B
Raw Permalink Normal View History

Set merge=union on index.html Since we're usually just appending lines to the file, it might make sense to tell git to merge the file as union and not omit lines that were missing on the branch if master has had them added. source: https://krlmlr.github.io/using-gitattributes-to-avoid-merge-conflicts/ Text from git docs: https://git-scm.com/docs/gitattributes > Run 3-way file level merge for text files, but take lines from both > versions, instead of leaving conflict markers. This tends to leave the > added lines in the resulting file in random order and the user should > verify the result. Do not use this if you do not understand the > implications.
8 years ago
 
  1. ./index.html merge=union