JabRef / jabref

15%

master: 97%

LAST BUILD ON BRANCH changelog-easier-merge

branch: changelog-easier-merge

CHANGE BRANCH

x

Reset

• changelog-easier-merge
• abstractpusher
• acmfetcher
• add-command-line-options
• add-show-preferences-dialog
• add_example_to_formatter
• all-fields
• architecture
• auto-complete
• aux-dialog
• better-merge-entries-dialog
• betterduplicatechecket
• bibtex-model
• builds_jabref_org
• casechangers-vs-bibtexcasechanger
• catalog-crawler
• change-entry-type
• cherry-formatter
• ci-changes
• circleci_test_for_tag_build
• cleaneroo
• cleanexport
• cleanup-preferences
• cleanup_formatter_tests
• close-actions
• contributors
• crossref_support_at_cleanup_rename
• cryptedpdfs
• custom-to-bibtex
• database-type-detection
• databaseWriter
• databasefix
• dataformat_always_ISO-8601
• default-dir
• default-lang
• default_enable_remote_server
• delete-entry-to-bibtex-menu
• delete-local-file
• dev_2.11
• diff
• discussBibEntryAssert
• doi-field
• doi-lookup
• duplicate-warning
• eclipse_config
• enable-merge-entries-at-context-menu
• ensure-no-duplicates-in-property-files
• fast-search
• fieldnames_lowercase
• file-based-bibtex-mode
• file-header
• file-links
• fix-1163
• fix-599
• fix-644
• fix-845
• fix-LatexFieldFormatter
• fix-UTF8-in-OpenDatabaseAction
• fix-coverity-warnings
• fix-encoding-strings
• fix-filetype-icon-issues
• fix-linebreaking
• fix-metaData-linebreaking
• fix890
• fixLocalizationWarnings
• fixRussianInstaller
• fix_963
• fix_formatter_descriptions
• fixed-608
• fixed883
• formatchars
• formatter-interface
• formatters
• github_templates
• groupAuto
• gui-testing
• gvk_biblatex
• gvk_fetcher
• icon-font-prototype
• icon-update
• icons
• ieee-journal-abbreviations
• improve-case-changers
• improve-exception-handling
• improve-sync-language-script
• improveLanguage
• improve_circleci_caching
• improved-menu-structure
• increase-saving-speed
• install-privileges
• install4j
• introduce-save-actions
• issue-564
• issue-565
• issue_834
• javafx
• jdk-bug
• journal-mgmt-improvements
• less-console-output-in-tests
• licenses
• livesearch
• localization_cleanup_for_3.0
• macosx-nicer-toolbar
• maintable-sortarrows
• make-model-independent
• master
• merge-entry-type-change
• mime
• minorfixes
• mlep-patch-1
• mlep-patch-2
• mlep-patch-3
• mlep-patch-4
• mode-switcher
• model-package
• more-integrity-checks
• move-entry-editor
• move-jabrefframe
• move-workers
• movemenus
• mrdlib_removal
• native
• new_iconset
• no-crystal
• no-icon-in-toolbar-for-rare-actions
• null-panel
• online-help
• oolinux
• oorefactoring
• ooreferencelist
• open-jdk-bug
• openjdk8
• oscargus-fewertranslations
• pagenumbers
• pages-checker
• pdfimport
• preferences
• prtemplate
• refactor-database-code
• refactor-entrytype
• regex-search
• remaining-fields
• remember-last-folder
• remove-field-saving-options
• remove-global-sorting
• remove-legacy-sync-pdf-or-ps
• remove-legacy-tools-integrity-check
• remove-move-to-systray
• remove-non-compact-rank
• remove-option-to-set-custom-icon-theme
• remove_AlternativeDisplayName
• remove_eclipse_ide_settings
• replaceAuthorsFormatter
• revise-maintable
• rm-legacy-compatibility
• rm-pdfpanel
• rm-sessions
• rm-url-sanitizer
• save-actions-gui
• search-improvements
• set-mac-lookAndFeel
• simplify-key-bindings
• sqlcleanup
• stable-serialization
• tab-view-entries
• tests
• tex-prefs
• timestampformat_always_ISO-8601
• travis-openjdk
• tweakPDfImporter
• tweakPdfContentImporter
• tweakPdfImporter
• uisearchhistory
• unlinked-files
• unlinked-pdfs
• update-lookAndFeels
• upload_to_ge.tt
• usetextanalyzer
• v_2.11b4
• v_2.11b5
• win-pintaskbar
• window-size

Build # 971

Build Type

push

travis-ci

Committed by simonharrer

Commit Message

Reduces CHANGELOG merge conflicts by always relying on the union merge option

Run Details

8015 of 52029 relevant lines covered (15.4%)

0.15 hits per line