(ctx context.Context, id string, w io.Writer)
| 490 | } |
| 491 | |
| 492 | func (r *Repository) Merge(ctx context.Context, id string, w io.Writer) error { |
| 493 | envInfo, err := r.Info(ctx, id) |
| 494 | if err != nil { |
| 495 | return err |
| 496 | } |
| 497 | |
| 498 | return RunInteractiveGitCommand(ctx, r.userRepoPath, w, "merge", "--no-ff", "--autostash", "-m", "Merge environment "+envInfo.ID, "--", "container-use/"+envInfo.ID) |
| 499 | } |
| 500 | |
| 501 | func (r *Repository) Apply(ctx context.Context, id string, w io.Writer) error { |
| 502 | envInfo, err := r.Info(ctx, id) |