Code Monkey home page Code Monkey logo

haoconnect's Introduction

##代码拷贝与二次合并##

###创建分支

  • 其实主线和分支只是一种称呼，本质就是两个路径不同的文件夹。
  • 创建分支，就是复制其他文件到一个新的目录里继续开发。
cd www/lib/
svn copy svn://[email protected]/haoframe/web/HaoConnect/php/HaoConnect .
svn ci . -m "copy HaoConnect first time"

###在分支上继续开发 *其实就是拷贝出文件后，在新文件里，继续开工

###合并预览

  • 当你在分支里开工一段时间后，你可以比较两个文件夹的变化（其实你可以比较任何文件并合并他们，只是这里用于了主线和分支这两个特定的场景中而已）
  • --dry-run选项是只提供合并后状态的预览，并不实际更改文件
cd www/lib/HaoConnect
svn merge svn://[email protected]/haoframe/web/HaoConnect/php/HaoConnect --dry-run

###直接合并

cd www/lib/HaoConnect
svn merge svn://svn.haoxitech.com/haoframe/web/HaoConnect/php/HaoConnect
  • 如果合并是出现冲突，可以选择p来延迟，然后针对性的编辑冲突的文件，编辑完后，可以使用resolved来移除当地的冲突标记。
svn resolved xxx.php

haoconnect's People

Contributors

wanyaxing avatar wtwt91 avatar binkingliang 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.