2016년 3월 24일 목요일

git 에서 리모트 리포지토리를 로컬로 덮어쓰기

실서버 소스를 약간 수정한 뒤 git pull을 했더니, conflict가 일어나서 패닉상태가 되었을때.. 이 두 커멘트면 해결이 가능하다.

$ git fetch origin
$ git reset --hard origin/master

참고로 인터넷상에, git pull 커멘드를 이용해 강제로 pull을 받는 방법이 소개되어 있는데, pull은 git fetchgit merge origin/master를 동시에 해주는 커멘드로써, 로컬에서 소스와 merge할 일이 없으면 되도록이면 쓰지 않는게 좋다.

댓글 1개:

  1. In an effort to change lawmakers worked a clause into the 2023 finances that phases out promo tax deductions for operators after 12-months available in the market}. The state structure solely permits wagering within Deadwood and tribal lands, but some policymakers consider statewide cellular wagering can be accredited lengthy as|so lengthy as} the servers are positioned in Deadwood. 우리카지노 Legislation to take action gained little traction in 2021 or in 2022, but could open an attention-grabbing new digital market in the years to come back. Lawmakers repealed an in-person cellular registration requirement, but the small population and lone legal possibility maintain revenues small, regardless of Rhode Island’s proximity to Massachusetts. New Hampshire has accomplished decently properly regardless of its limited market, but this might finish when Massachusetts launches cellular wagering. Not surprisingly, Montana’s limited betting choices and sparse population make it a small a part of} the general U.S. market.

    답글삭제