Code Monkey home page Code Monkey logo

branch's Introduction

Git Branch

Git 기초

  • git init
  • git add
  • git commit
  • git log

Git 원격저장소 (remote)

  • git remote add [저장소이름] [저장소주소]
  • git remote : 원걱저장소의 리스트(이름)
  • git remote -v : 원격저장소의 리스트(이름, 주소)

Git 브랜치(branch)

  • git branch : Branch 리스트 출력
  • git branch [브랜치이름] : 새로운 Branch 생성
  • git checkout [브랜치이름] & git switch [브랜치이름] : Branch 이동
  • git branch -d [브랜치이름] : Branch 삭제
  • git branch -b [브랜치이름] & git switch -c [브랜치이름] : Branch 생성 & 이동
  • git merge [브랜치이름] : 현재 Branch에서 특정 Branch를 병합

Git Merge 시나리오

  1. fast-forward merge
  2. auto merge (without conflict)
  3. merge with conflict

Conflict 해결방법

conflict 발생조건

  • 동일 파일 그리고 동일 라인의 내용이 충돌될 때

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.