following situation: I made some changes in the development branch ( commit f + g ). Unfortunately, there were some changes in the master branch (commit e + d),
advanced-threat-protection
graph-theory
wpforms
proxyquire
android-tvprovider
downloadfileasync
jsf-2.2
alasql
laravel-filesystem
dockerfile
common-data-service
knowledge-base-population
netdata
submit-button
google-cloud-recommendation
cpanel-xmlapi
ntp
rhel
screen-grab
kendo-dropdown
google-cloud-load-balancer
data-hiding
prompt-toolkit
thick-client
clearfix
backgroundworker
http-toolkit
user-agent
python-3.x
mixed-content