Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[EPM] Update docs for merging master into feature branch #50396

Merged
merged 2 commits into from
Nov 13, 2019
Merged

[EPM] Update docs for merging master into feature branch #50396

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3def91
Update docs for merging master into feature branch
Nov 12, 2019
efe2297
Merge branch 'feature-integrations-manager' into update-merge-master-…
elasticmachine Nov 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions x-pack/legacy/plugins/integrations_manager/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,25 @@ We're using a long-running feature branch [`feature-integrations-manager`](https

<details>
<summary>Keeping up to date with upstream kibana</summary>

[jfsiii](http://github.com/jfsiii) will keep the branch up-to-date with `master` by periodically running `git merge master` locally and pushing. [This PR](https://github.com/elastic/kibana/pull/38255#issuecomment-499839073) has more information.

```bash
# checkout the elastic/kibana feature branch locally; overwriting any existing feature-integrations-manager
git checkout -B feature-integrations-manager upstream/feature-integrations-manager
## checkout feature branch to your fork
git checkout -B feature-integrations-manager origin/feature-integrations-manager

## make sure your feature branch is current with upstream feature branch
git pull upstream feature-integrations-manager

# fetch & merge latest
## pull in changes from upstream master
git pull upstream master

# push back to elastic/kibana
git push upstream
## push changes to your remote
git push origin

# switch back to feature-integrations-manager on your fork
git checkout -B feature-integrations-manager origin/feature-integrations-manager
# Open a **DRAFT PR**. Normal PRs will re-notify authors of commits already merged
# Draft PR will trigger CI run. Once CI is green ...

## push your changes to upstream feature branch
git push upstream
```
</details>

Expand Down