search

confluentinc / kafka-connect-jdbc

Kafka Connect connector for JDBC-compatible databases
Other
19 stars 955 forks source link

conflict resolve from 10.4.x to 10.5.x #1246

Closed rajdangwal closed 2 years ago

rajdangwal commented 2 years ago

Failing pint merge due to merge conflicts. Merging them manually.

20:14:28    from 10.4.x to 10.5.x
20:14:28      315eea01 [maven-release-plugin] prepare for next development iteration
20:14:28      0adc0bd2 [maven-release-plugin] prepare release v10.4.4
20:14:28    from 10.5.x to master
20:14:28      2ab7ba14 [maven-release-plugin] prepare for next development iteration
20:14:28      0c8722cc [maven-release-plugin] prepare release v10.5.3
20:14:28  Found unmerged commits from branches: 10.4.x to 10.5.x, 10.5.x to master
20:14:28  Please merge them using `pint merge` or manually with `git merge`