@TomPallister, this is technical delivery, updating of main to trigger the release once again after the latest failed build.
I will use Create a merge commit option (or Rebase and merge, which is preferred) for PRs to main to save history of development. For hotfixes I will use Squash and merge opt for sure.
Don't be confused by direct merging of develop branch. I violate requirements of the Gitflow workflow by this PR only. Let this merge commit will be a start point aka A develop branch is created from main because both branches will have the same top commit.
So, let this PR be a start point, step 1 of Gitflow.
@TomPallister, this is technical delivery, updating of main to trigger the release once again after the latest failed build. I will use Create a merge commit option (or Rebase and merge, which is preferred) for PRs to main to save history of development. For hotfixes I will use Squash and merge opt for sure.
Don't be confused by direct merging of develop branch. I violate requirements of the Gitflow workflow by this PR only. Let this merge commit will be a start point aka
A develop branch is created from mainbecause both branches will have the same top commit. So, let this PR be a start point, step 1 of Gitflow.