Giter Club home page Giter Club logo

social_worker_front's Introduction

SOCIAL_WORKER_FRONT

SK LOOKIE BM - SOCIAL WORKER - FRONTEND

social_worker_front's People

Contributors

jeongiin avatar

Watchers

James Cloos avatar ulimy avatar

social_worker_front's Issues

로컬에 레포지토리 내역 최신화 방법.

원본 저장소 커밋 내역을 로컬에 반영시키는 법

1. 원격저장소 주소 저장

  • upstream이라는 이름으로 remote 주소 저장

git remote add upstream <<원본 저장소 주소>>

2. upstream 내역을 스테이징 영역에 fetch

git fetch upstream

3. 로컬에 원하는 브런치 커밋 내역 merge

  • upstream으로 저장된 레포지토리의 dev 브랜치에 반영된 커밋 내역을 내 로컬 개발물에 병합한다.

git merge upstream/dev

Commit rules

Commit rules

  • Add a : a 추가
  • Fix b : b 수정
    • 원본에서 에러사항 수정 및 보완
  • Delete c : c 삭제
  • Update d : d 업데이트
    • 에러 수정이 아닌 기능 추가 및 강화

default branch 변경

default branch를 편의상, main -> master로 변경함.
main branch는 삭제함.

png 파일 수정함.

image

  • 화면 density에 따른 버튼 및 ui화면 png 추가하였으므로 꼭 머지해서 개발하기..!

Branch Rules

Branch Rules

  1. master
    • Final version branch (version 0.0)
  2. Develop
    • feature merge, commit (version 0.0 feat_x, feat_y)
  3. Release
    • Only bug fix branch (version 0.0)
  4. Feature_x
    • Activity branch x : Activity name (ex: feature_map)

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.