Giter Club home page Giter Club logo

git3's Introduction

git3

git3

gitwithpycharm

git使用

熟悉一下git的使用，重点是集成到pycharm中的使用

创建

自己单独创建一个项目，创建dev分支，从dev分支创建test分支，dev分支修改文件，test分支修改文件，

合并

把test分支合并到dev by：git merge test, 合并过程中要有冲突（这个过程必须有） 此时出现修订界面，编辑代码后完成合并

解决冲突

通过代码的对照和在最终位置的修改，已经解决了冲突

更新

将最近版本更新到test环境中 git checkout test； git merge dev

版本回滚

git revert HEAD

git3's People

Contributors

stevelau1015 avatar

Watchers

avatar

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.