![]() ![]() Which means git pull -rebase has to do a little bit more than that. Without going into why they would do that, and how many beers (I prefer rum+coke, thank you!) should be offered in compensation to downstream users, let’s just try and describe how git helps you deal with it.Ī normal git pull is, loosely speaking, something like this (we’ll use a remote called origin and a branch called foo in all these examples): # assume current checked out branch is "foo"Īt first glance, you might think that a git pull -rebase does just this: git fetch originīut that will not help if the upstream rebase involved any “squashing” (meaning that the patch-ids of the commits changed, not just their order). This can be a big problem – causing messy conflicts for us if we’re downstream. Sometimes we have an upstream that rebased/rewound a branch we’re depending on. Gitolite documentation has another /gitolite in the URL, so "" and so ALL my git related stuff gets carried over. That's just an artifact of "" being translated to Nope: I tried that (git pull -rebase upstream master*) and still got a dependency not found related error: Traceback (most recent call last):įile "/Users/andyk/Documents/develop/home-assistant/homeassistant/_main_.py", line 363, in mainįile "/Users/andyk/Documents/develop/home-assistant/homeassistant/_main_.py", line 121, in get_argumentsįile "/Users/andyk/Documents/develop/home-assistant/homeassistant/config.py", line 18, in įile "/Users/andyk/Documents/develop/home-assistant/homeassistant/core.Although this page has a "" URL, this is not about gitolite. Rebase onto master to avoid new dependencies releases problems.The script/setup have to be run just one time, at the beginning of the project, which I already did of course. No need for script/setup rerun after rebasing on upstream.So, beside the different branching strategy (which I will try to simplify a bit as far as our project specs will allow it) I get this two points: What does my upstream integration process is missing then?Īm I supposed to rerun any setup procedure after integrating my work with git? If yes, how should it be done? Is it the case that the updated upstream/dev branch needs a voluptuous more recent version? ImportError: No module named 'voluptuous.humanize' 'voluptuous' is not a package Import nfig as config_utilįile "/Users/andyk/Documents/develop/home-assistant/homeassistant/config.py", line 17, in įrom re import valid_entity_idįile "/Users/andyk/Documents/develop/home-assistant/homeassistant/core.py", line 24, in įrom voluptuous.humanize import humanize_error Load_entry_point('homeassistant', 'console_scripts', 'hass')()įile "/Users/andyk/Documents/develop/home-assistant/homeassistant/_main_.py", line 358, in mainįile "/Users/andyk/Documents/develop/home-assistant/homeassistant/_main_.py", line 116, in get_arguments Git rebase master_base -> rebase local dev_base branch on top of local master_base branchĪfter that I checkout out to my dev_base branch again to test if everything was working, but launching hass resulted in the following error: Traceback (most recent call last):įile "/Users/andyk/Documents/develop/python/virtualenvs/asbox/bin/hass", line 9, in Git checkout dev_base -> checkout to local dev_base branch Git rebase dev -> rebase local master_base branch on top of local dev branch Git checkout master_base -> checkout to local master_base branch Git rebase upstream/dev -> rebase local dev branch on top of upstream/dev branch Git checkout dev -> checkout to local dev branch So, after committing my fronius-commit and merging everything down until both master_base and dev brnaches contain my fronius-commit, I did the following to get the upstream/dev integrated into my work: git fetch upstream dev -> fetch upstream/dev branch When a feature is ready, I commit it and then merge dev_base onto master_base and master_base onto dev. I have got this git local repos structure:īranch dev (the dev branch of my origin repo forked out of Home Assistant upstream central repo)īranch master_base (checked out from dev)īranch dev_base (checked out from master_base) I made my first commit about that and now I wanted to fetch the upstream dev branch and integrate it with my work. ![]() I am developing a Fronius Inverter component. I am not an expert with git collaboration workflows. ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |