jeans/developers.home-assistant
jeans/developers.home-assistant
1
0
Fork 0
mirror of https://github.com/home-assistant/developers.home-assistant.git synced 2025-07-27 19:26:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add rebase warning (#119)

Browse Source 
* Added rebase warning

* Update message and position
This commit is contained in:
cdce8p 2018-10-10 22:23:05 +02:00 committed by Fabian Affolter
parent b09a9ded6c
commit 3becc951bf
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/development_catching_up.md
View File

@ -4,6 +4,8 @@ title: "Catching up with Reality"
If it's taking a while to develop your feature, and you want to catch up with what's in the current Home Assistant `dev` branch, you can use `git rebase`. This will pull the latest Home Assistant changes locally, rewind your commits, bring in the latest changes from Home Assistant, and replay all of your commits on top.
> If you use the workflow below, it is important that you force push the update as described. Git might prompt you to do `git pull` first. Do **NOT** do that! It would mess up your commit history.
```bash
# Run this from your feature branch
$ git fetch upstream dev # to pull the latest changes into a local dev branch