kicad-developers team mailing list archive

[Simon Richter <Simon.Richter@xxxxxxxxxx>]

Hi,

> This will get 3 separate SHA (one for each branch).  Or would you prefer
> us to use git merge to keep the original SHA with an additional merge
> commit?  I can see arguments for each but wanted to check which is
> preferred.

To make merge commits work, they'd have to be based on the common base:

git checkout -b fix-xy `git merge-base master 5.0 5.1`
# hack hack hack
git commit
git checkout master
git merge fix-xy
git checkout 5.0
git merge fix-xy
git checkout 5.1
git merge fix-xy

This would work, but there's a lot of potential for errors here, and
looking at the commit history would show all bugfix branches sprout off
at the same place.

   Simon