6
92%
develop: 92%

Ran 02 May 2016 10:14PM UTC

Files 113

Run time 123min

Badge

Embed ▾

Committed 02 May 2016 09:38PM UTC coverage: 80.334% (-0.01%) from 80.344%

Job # XML_GENERATOR="gccxml"

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"

Coverage Stats

8133 of 10124 relevant lines covered (80.33%)

0.8 hits per line

gccxml / pygccxml / 433 / 6
92%
develop: 92%

README BADGES
x

Markdown

Textile

RDoc

HTML

Rst

Source Files on job 433.6 (XML_GENERATOR="gccxml")

gccxml / pygccxml / 433 / 6 92% develop: 92%

README BADGES x

Markdown

Textile

RDoc

HTML

Rst

Source Files on job 433.6 (XML_GENERATOR="gccxml")

gccxml / pygccxml / 433 / 6
92%
develop: 92%

README BADGES
x