Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add warning message in merge instructions when AutodetectManualMerge was not enabled #31805

Merged
merged 4 commits into from
Aug 10, 2024
Merged

Add warning message in merge instructions when AutodetectManualMerge was not enabled #31805

merged 4 commits into from
Aug 10, 2024

Commits on Aug 8, 2024

  1. Add warning message in merge instructions when AutodetectManualMerge was 

    not enabled

quick-fix go-gitea#31433 , maybe need
more disscusion about better solutions.

Signed-off-by: a1012112796 <1012112796@qq.com>
    @a1012112796
    a1012112796 committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    c7db4af View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2024

  1. Merge branch 'main' into zzc/dev/merg_warning

    @GiteaBot
    GiteaBot authored Aug 9, 2024
    Configuration menu
    Copy the full SHA
    0ccd3d6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into zzc/dev/merg_warning

    @GiteaBot
    GiteaBot authored Aug 9, 2024
    Configuration menu
    Copy the full SHA
    54358b2 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2024

  1. Merge branch 'main' into zzc/dev/merg_warning

    @GiteaBot
    GiteaBot authored Aug 10, 2024
    Configuration menu
    Copy the full SHA
    037f1de View commit details
    Browse the repository at this point in the history