merge ( with merge commit) develop to master
this approach will add merge commit (it is quite big) but preserves history form develop (commits numbers are the same) so it is easy to understand which changes are taken to the master
this approach will add merge commit (it is quite big) but preserves history form develop (commits numbers are the same) so it is easy to understand which changes are taken to the master
assigned to @Ickiewicz
i close the MR, it looks like master has been changed and the changes were to included in develop (or it was done wrong) and currently there is no easy way to use merge, what is bad because we are forced to rewrite commits with rebase
develop
to master
changed target branch from develop
to master
closed