433
92%

Ran 02 May 2016 10:05PM UTC

Jobs 13

Files 114

Run time 143min

Badge

Embed ▾

pending completion

Build # 433

Build Type

push

travis-ci

Committed by

iMichka

Commit Message

Add .gitattributes to prevent overwriting of the Readme file

when merging hotfix branches to develop

From: http://www.alberts.me/post/always-keep-your-copy-of-a-particular-file-in-a-git-merge/

git config merge.ours.name '"always keep ours" merge driver'
git config merge.ours.driver 'touch %A'
echo "README.rst merge=ours" >> .gitattributes
git add .gitattributes
git commit -m "keep my copy of the README.rst file"

Run Details

8356 of 10144 relevant lines covered (82.37%)

10.46 hits per line

Jobs

ID	Job ID	Ran	Coverage
1	433.1 (XML_GENERATOR="gccxml")	02 May 2016 10:05PM UTC	80.21	Travis Job 433.1
2	433.2 (XML_GENERATOR="gccxml")	02 May 2016 10:07PM UTC	80.17	Travis Job 433.2
3	433.3 (XML_GENERATOR="gccxml")	02 May 2016 10:09PM UTC	80.34	Travis Job 433.3
4	433.4 (XML_GENERATOR="gccxml")	02 May 2016 10:10PM UTC	80.34	Travis Job 433.4
5	433.5 (XML_GENERATOR="gccxml")	02 May 2016 10:12PM UTC	80.34	Travis Job 433.5
6	433.6 (XML_GENERATOR="gccxml")	02 May 2016 10:14PM UTC	80.33	Travis Job 433.6
7	433.7 (XML_GENERATOR="castxml")	02 May 2016 10:15PM UTC	80.63	Travis Job 433.7
8	433.8 (XML_GENERATOR="castxml")	02 May 2016 10:17PM UTC	80.8	Travis Job 433.8
9	433.9 (XML_GENERATOR="castxml" COMPILER=g++-5)	02 May 2016 10:19PM UTC	80.83	Travis Job 433.9
10	433.10 (XML_GENERATOR="castxml")	02 May 2016 10:19PM UTC	80.8	Travis Job 433.10
11	433.11 (XML_GENERATOR="castxml" COMPILER=g++-5)	02 May 2016 10:21PM UTC	80.83	Travis Job 433.11
12	433.12 (XML_GENERATOR="castxml" TRAVIS_PYTHON_VERSION="2")	02 May 2016 10:30PM UTC	80.62	Travis Job 433.12
13	433.13 (XML_GENERATOR="castxml" TRAVIS_PYTHON_VERSION="3")	02 May 2016 10:31PM UTC	80.79	Travis Job 433.13

Source Files on build 433

Detailed source file information is not available for this build.

gccxml / pygccxml / 433
92%

README BADGES
x

Markdown

Textile

RDoc

HTML

Rst

Jobs

Source Files on build 433

gccxml / pygccxml / 433 92%

README BADGES x

Markdown

Textile

RDoc

HTML

Rst

Jobs

Source Files on build 433

gccxml / pygccxml / 433
92%

README BADGES
x