michael-o commented on issue #32: [MRELEASE-549] Add support for the "--pin-externals" operations in SCM branch and tag operations URL: https://github.com/apache/maven-release/pull/32#issuecomment-578495141 Still fishy: ``` $ git checkout master Switched to branch 'master' Your branch is up to date with 'origin/master'. mosipov@mikaw10 MINGW64 /d/Entwicklung/Projekte/maven-release (master) $ git pull Already up to date. mosipov@mikaw10 MINGW64 /d/Entwicklung/Projekte/maven-release (master) $ git merge theit/MRELEASE-549 Auto-merging maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java CONFLICT (content): Merge conflict in maven-release-plugin/src/main/java/org/apache/maven/plugins/release/PrepareReleaseMojo.java Auto-merging maven-release-manager/src/main/mdo/release-descriptor.mdo CONFLICT (content): Merge conflict in maven-release-manager/src/main/mdo/release-descriptor.mdo Auto-merging maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java Auto-merging maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java Auto-merging maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorBuilder.java CONFLICT (content): Merge conflict in maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorBuilder.java Auto-merging maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java Auto-merging maven-release-api/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptor.java CONFLICT (content): Merge conflict in maven-release-api/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptor.java Automatic merge failed; fix conflicts and then commit the result. ```
---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
