diff options
| author | Karel Kočí <cynerd@email.cz> | 2024-11-18 15:23:41 +0100 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2024-11-18 15:23:41 +0100 |
| commit | 00c2d83c62603a13f54c5037f08d43591a29d6fb (patch) | |
| tree | 1685f4e2aed4dd4e7b42c3b633f3e4949cd4e1ff | |
| parent | b2f1bd289e9bae405f95ba0aa2478da45c07e713 (diff) | |
| download | shellrc-00c2d83c62603a13f54c5037f08d43591a29d6fb.tar.gz shellrc-00c2d83c62603a13f54c5037f08d43591a29d6fb.tar.bz2 shellrc-00c2d83c62603a13f54c5037f08d43591a29d6fb.zip | |
This ensures that Gitlab processes the master update before we remove
branch and thus close merge request.
| -rw-r--r-- | shellrc.d/git | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/shellrc.d/git b/shellrc.d/git index 15b949a..18b3b79 100644 --- a/shellrc.d/git +++ b/shellrc.d/git @@ -47,6 +47,7 @@ gitbmerge() ( fi git merge --ff-only "$branch" \ && git push \ + && sleep 1 \ && git branch -d "$branch" \ && { if [ -n "$upstream" ]; then git push origin :"$branch"; fi; } ) |