Code Monkey home page Code Monkey logo

Comments (3)

Ir1d avatar Ir1d commented on May 18, 2024 1

建议以后一个 pr 只做一件事,这样 squash 之后不会把几个内容合到一个 commit 里面= =

以及为了防止(我)日后点错,已经关了 create a merge commit,默认是 squash……

from oi-wiki.

Ir1d avatar Ir1d commented on May 18, 2024

滋兹。:+1:
其实都行(最开始一直在 squash ,后来感觉没啥大区别

upd: 关于 amend,现在很大一部分更新是在 Github 网页版上进行的,并不能滋兹 amend,所以个人建议不强求。

from oi-wiki.

Ir1d avatar Ir1d commented on May 18, 2024

upd: 我发现 squash 了之后如果 24OI repo 里面对应内容又有了更新,就会被视为是 conflict,在 fork 里面的体验非常不好,可能需要删了重新 fork 才能开 pr。这样搞会大幅增加操作门槛(网页版上操作变得太复杂),so 我觉得目前还是不要 squash 比较好。

什么时候建议用 squash?多个 commit 中间有不希望引入主仓库的内容(加入了后来又删掉了这种)

cc: @24OI/wiki

对之前 xjb squash 带来的不便十分抱歉,这里就不 at 了……

from oi-wiki.

Related Issues (20)

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.