#138: GetComponents should use "git pull --rebase" for updating ---------------------------+------------------------------------------------ Reporter: eschnett | Owner: ian.hinder@… Type: defect | Status: new Priority: major | Milestone: Component: GetComponents | Version: Keywords: | ---------------------------+------------------------------------------------ To update a git repository, one should issue the following commands in this order:
git stash git pull --rebase git stash apply
If this is not done, the update either fails, or generates many additional patches to handle merge conflicts.