GithubHelp home page GithubHelp logo

gitstudy's People

Contributors

jungu009 avatar

Watchers

 avatar  avatar

gitstudy's Issues

有多个长期的分支,发现一个共同的bug,如何一起修改

参考多个分支中的相同部分的代码修改是否可以同时完成?

第一种办法:

如果branch1/2/3都是基于某个分支(比如develop)分出来的,那么可以切换到develop上面fix然后分别切换到branch单个分支上做rebase develop .这样三个branch分支都打上补丁。 不过如果你这三个branch分支是push到仓库中并且有人pull那么就不能这么做。否则别人已经pull的branch分支会彻底错乱!

第二种方法:

切换到develop上面开一个分支fix-bug1,然后分别切换到branch三个分支上merge fix-bug1.

第三种办法:

如果这三个分支不是共同一个源分支,那么就只有分别打补丁了

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.