Skip to content

Commit 3722359

Browse files
Add util script
Signed-off-by: Lukasz Gryglicki <lgryglicki@cncf.io> Assisted by [OpenAI](https://platform.openai.com/) Assisted by [GitHub Copilot](https://github.com/features/copilot)
1 parent 8acba3e commit 3722359

2 files changed

Lines changed: 16 additions & 0 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,3 +268,4 @@ cla-backend-go/golang-api.err
268268
cla-backend-go/golang-api.log
269269
utils/otel_dd_go/otel_dd
270270
audit.json
271+
spans*.json

utils/git_sync_to_dev.sh

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/bin/bash
2+
echo 'To be used when you are on a feature branch based on main and want to sync it with current dev branch, so after merging current branch to main it will be the same as dev but you can commit this once'
3+
4+
git fetch origin
5+
git branch
6+
git status
7+
echo -n 'proceed (ctrl+c to stop)? '
8+
read
9+
10+
git rm -r --cached .
11+
# git checkout origin/dev -- .
12+
git checkout dev -- .
13+
git add -A
14+
15+
echo "Now you can do: git commit -S -asm 'msg'; git push"

0 commit comments

Comments
 (0)