search

SPECFEM / specfem3d

SPECFEM3D_Cartesian simulates acoustic (fluid), elastic (solid), coupled acoustic/elastic, poroelastic or seismic wave propagation in any type of conforming mesh of hexahedra (structured or not).
GNU General Public License v3.0
392 stars 223 forks source link

Use feature branches? #1541

Open gassmoeller opened 1 year ago

gassmoeller commented 1 year ago

All of the pull requests that were opened during the tutorial today were closed again by buildbot, because they all happened on the same devel branch, which is now conflicting with everyone else's devel branch.

Short term solution: It is probably possible to sync the devel branch of everyone with the main repository? @danielpeter do you know how to do that? I have not done this before (keep one devel branch synched after changes have been merged). Worst case we can cherry-pick the commits onto the new devel branch.

Long term, I think the switch to a feature branch workflow will be more efficient, because it will work with many simultaneous pull requests without any rebases or sync's happening. Something to discuss at one of the virtual developer meetings?

gassmoeller commented 1 year ago

I opened a new pull request (#1542) that contains all the fixes on an up-to-date version of the devel branch, so at least we can get all the changes in that were made today. I would still like to discuss changes to the branching model at some point, because the current workflow will create problems for contributors working for a long time on their branches (it basically requires them to do a rebase when they want to merge).