QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-17 20:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

SPRINT-18: fixed unit test on auth0 reuse

Browse Source
This commit is contained in:
Tim Chamberlain
2023-01-04 22:20:38 -06:00
parent 2874b98b66
commit de05e4ae58
4 changed files with 44 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
qqq-dev-tools/bin/resolve-pom-conflicts.sh Executable file
View File

@ -0,0 +1,8 @@
#!/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