GithubHelp home page GithubHelp logo

Comments (9)

SpootyMcSpoot avatar SpootyMcSpoot commented on September 3, 2024 11

Any update here? I'd like to see the option of enforcing this without the button present. Devs can rebase on their local and push rather than use the button.

from 404-pagenotfound.

mo-klue avatar mo-klue commented on September 3, 2024 4

https://github.com/motakbiri/UpdateBranchRemover/

from 404-pagenotfound.

lnfnunes avatar lnfnunes commented on September 3, 2024 2

@rsp we don't "disable" the button as you may be thinking, we just remove the check forcing branches to be up-to-date with master. Personally, I prefer to keep this ON, but as @luisfmsouza said, it adds some misunderstanding on novice people and difficult contributions with some kind of invisible contribute wall rule!

Settings 👇
image

So far, so good! We had no problems without this option 🙂

from 404-pagenotfound.

lnfnunes avatar lnfnunes commented on September 3, 2024

@luisfmsouza I have a different opinion about this point. I like to enforce branches to be up-to-date with master always, so the "Update branch" button is just a try, exactly, to prevent asking people to do rebasing themselves.

Even though your print is showing a noisy, the master timeline is kept untouched and clean
image

How to garantee the PR is up-to-date with master and we are not loosing anything? I'm not sure if only in conflicted state this could happen...

Anyway, I'll change the settings and we can give it a try ✌️

from 404-pagenotfound.

luisfmsouza avatar luisfmsouza commented on September 3, 2024

Let's try it.

from 404-pagenotfound.

rsp avatar rsp commented on September 3, 2024

Sorry for an off-topic question but how have you managed to disable the 'Update branch' button? I was sure that it is impossible to disable it (see those comments).

from 404-pagenotfound.

Bubesz avatar Bubesz commented on September 3, 2024

@rsp we don't "disable" the button as you may be thinking, we just remove the check forcing branches to be up-to-date with master. Personally, I prefer to keep this ON, but as @luisfmsouza said, it adds some misunderstanding on novice people and difficult contributions with some kind of invisible contribute wall rule!

Settings 👇
image

So far, so good! We had no problems without this option 🙂

This was extremely valuable information for me! I'm glad you shared it! 👍

I added the "Require status checks to pass before merging" rule with the aforementioned "Require branches to be up to date before merging" rule at the beginning of a testing period. Because of the low intensity of coding (to main branch), we did not come across the "Update Branch" button for days and on one hand, I forgot I added such a rule, and more importantly,

I expected this button to rebase the PR HEAD branch onto the base branch but instead, it creates a merge commit. We use rebase everywhere, so we'd like to avoid merges. This way, we had to manually rebase our branches which was a headache. Currently, the update strategy of the Update Branch button cannot be configured. Actually, there is an issue related to this: isaacs/github#1419

from 404-pagenotfound.

bgrosse-midokura avatar bgrosse-midokura commented on September 3, 2024

image

I can't find this checkbox in Settings?

Edit: found it under Settings->Branches->Branch protection rules->Edit button

from 404-pagenotfound.

lnfnunes avatar lnfnunes commented on September 3, 2024

Enabled it!

Screen Shot 2021-08-05 at 22 22 23

from 404-pagenotfound.

Related Issues (17)

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.