-
Simplify the current process so it can then be automated to run whenever a new tag is pushed upstream (https://github.com/kubernetes/kubernetes/releases/tag)
This is possible if we modify how the b…
-
### Commit(s) to merge
3b36b20d6b92d881b7c59cd47a7e4e61ce1dbee8
### Target
stable
### Prepared changelist for beta/stable
https://dart-review.googlesource.com/c/sdk/+/387220
### Issue Descriptio…
-
Forked from #83
-
Type: Bug
Repro steps:
1. Have conflicting changes in two branches.
2. Cherry pick commit from one branch into another.
3. Use merge editor to handle conflict
VS Code version: Code - In…
-
**Describe the problem/challenge you have**
Sometimes, `vendir sync` command can produce a lot of output. It depends on what kind of sources it syncs.
Example output of syncing a single git so…
-
Pull https://github.com/Sonarr/Sonarr/commit/ca38a9b5774243c2e1c3cd1abfc8d218bca4409e
```
git cherry-pick -ex ca38a9b5774243c2e1c3cd1abfc8d218bca4409e
```
This commit has 3 conflict(s)
You can ask…
-
Pull https://github.com/Sonarr/Sonarr/commit/9875e550a8df22347f09c6658f185d94c21ff45b
```
git cherry-pick -ex 9875e550a8df22347f09c6658f185d94c21ff45b
```
This commit has 2 conflict(s)
You can ask…
-
From a conversation with @samreid.
Like `cd density; grunt maintenance-cherry-pick --dependency=density-buoyancy-common--sha=SHA --branch=1.2`
This is basically an alias for:
```js
awai…
-
I mean is really easy to do, its just cherry pick the latest manifest
-
I think cherry-picking is very useful for automating backports (that's my use-case at least)