search

nicoslr / python-intermediate-inflammation

A template software project for use in Intermediate Research Software Development Skills In Python course. Contact: @anenadic
MIT License
0 stars 0 forks source link

Develop branch is behind main #3

Open nicoslr opened 2 hours ago

nicoslr commented 2 hours ago

The develop branch is behind main and will cause code loss and conflicts if merged into main. The cause for this is that the lower branches used for development of specific functionalities were not consistently merged into develop during software development, so now different branches are at different points of development, with develop behind some of them.

nicoslr commented 2 hours ago

See 75e79cb0afe7ab8bda7c4af566a77e1fd3bd5237 for beginning of conflict.