mirror of
https://github.com/Kingsrook/qqq.git
synced 2025-07-18 05:01:07 +00:00
9 lines
381 B
Bash
Executable File
9 lines
381 B
Bash
Executable File
#!/bin/bash
|
|
|
|
############################################################################
|
|
## resolve-pom-conflicts.sh
|
|
## Tries to automatically resove pom conflicts by putting SNAPSHOT back
|
|
############################################################################
|
|
gsed "/Updated upstream/,/=======/d" pom.xml | gsed "/Stashed/d" > /tmp/temp-pom.xml
|
|
mv /tmp/temp-pom.xml pom.xml
|