Commit 6affc2b
committed
fix: use fetch-depth 0 and rebase -s ours to avoid shallow clone conflicts
Signed-off-by: souravbiswassanto <saurov@appscode.com>1 parent f7f40d4 commit 6affc2b
1 file changed
Lines changed: 2 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| 21 | + | |
21 | 22 | | |
22 | 23 | | |
23 | 24 | | |
| |||
66 | 67 | | |
67 | 68 | | |
68 | 69 | | |
69 | | - | |
| 70 | + | |
70 | 71 | | |
71 | 72 | | |
0 commit comments