GIT

브랜치간의 충돌의 해결

댓글

댓글 본문
  1. thomaslist
    https://www.pacificsneakers.com Nike Air Jordan Open Store
    https://www.adidasyeezyboost-350.us.com Discounted Adidas Falcon
    https://www.atlanticralphlauren.com Ralph Lauren Buy Online
    https://www.polooutlet.us.com Cheap Clothes Women Ralph Lauren
    https://www.katespadestyle.com Kate Spade Shoulder Bags
    https://www.cheap-jordansshoes.us.com Nike Air Jordan Sport
    https://www.jordanshoes.in.net Nike Blazer Top Designer Collections
    https://www.authenticadidas.com USA Adidas NMD Boost For Women
    https://www.poloralphlaurensport.com Polo Ralph Lauren Black White
    https://www.edhardy.org.uk Ed Hardy Tank authentic quality
    https://www.katespadenew.com Kate Spade Totes
    https://www.airjordanshoes.in.net Home Nike Air Jordan Outlet
    https://www.katespadeoutletnewyork.us.com Kate Spade enjoy great discount
    https://www.ralphlaurencolorfuls.com Ralph Lauren Sale Retailer
    https://www.poloralphlaurenbrand.com Polo Ralph Lauren Competitive Price
    https://www.polorlpony.com Ralph Lauren Dresses Factory Store
    https://www.coachoutlet-handbags.com Coach bags Discount
    https://www.offwhitetshirt.us.com OFF White USA Top Brand Wholesale Online
    https://www.coachsurprise.us.com Coach Wallets Outlet USA
    https://www.coachfactory-outlet.com cheap big coach
    https://www.salomonfrance.com Salomon Speedcross GTX for men
    https://www.airjordan4.us.com Nike Air Jordan New York
    https://www.ralphlaurenworldwide.com Discount Polo Ralph Lauren Clothing
    https://www.off-whiteitaly.com Off White Factory Store
    https://www.adidas.in.net Newest Adidas Ultra Boost
    https://www.adidasrealboost.com Adidas Shoes USA Factory Outlet
    https://www.nikeoutletsfactory.us.com Nike Blazer USA Factory
    https://www.airmaxsurprise.com Nike Air Max 90 For Women
    https://www.adidas-nmds.us.com Adidas Yeezy Boost Sale
    https://www.poloralphlaurenpolo.uk.com Ralph Lauren Cheap Prices
    https://www.katespadeoriginals.com Kate Spade Carry On Sale
    https://www.polooutletoutlet.us.com Official Polo Ralph Lauren Shirts
    https://www.donedhardy.us.com Ed Hardy official website Cheapest
    https://www.ed-hardy.uk.com cheap prices Ed Hardy UK
    https://www.ralphlaurenponyoutlet.com Cheapest Polo Ralph Lauren Price
    https://www.supremeny.us.com Supreme Sweatshirts Europe
    https://www.airjordanmid.com Air Jordan Low For Cheap
    https://www.coach-factoryoutletstore.com coach discount codes
    https://www.newcoachoutlet.com Coach sale New York
    https://www.nikeshoesoutlet.us.org Nike LeBron Great Deals
    https://www.supremeclothingonline.us.com Mens Supreme Clothing
    https://www.champions.us.com Champion Short T Shirt
    https://www.poloralphlauren-sale.us.com USA Ralph Lauren Vest Men
    https://www.kate-spadeoutletstore.us.com Kate Spade macy
    https://www.multigroundboots.com Special Soccer Offers
    https://www.edhardysoriginals.com Ed Hardy For Women
    https://www.prloutletclothing.com Shop Ralph Lauren Winter Clothes
    https://www.edhardys.us New Ed Hardy Products
    https://www.deepedhardy.com ED Hardy Hoodies Outlet
    https://www.authenticgoldengoose.com Large Discount Golden Goose Francy
    https://www.adidasoriginals.in.net Adidas NMD Boost USA Cheap Sale
    https://www.edhardyoriginals.top Authentic Discount Ed Hardy Suits
    https://www.usapandorauk.com Pandora Rings Outlet
    https://www.katespademore.com Kate Spade New York
    https://www.polooutlet.uk Ralph Lauren Shorts
    https://www.coachhandbagsoutlets.us.com Largest Fashion Store Coach
    https://www.atlanticairmax.com Nike Air Max US In Store
    https://www.coachcolorful.us.com Coach Handbags Sale
    https://www.katespadesale.us.com Kate Spade timeless
    https://www.ralphlaurenpopular.com Buy Real Ralph Lauren Track Suits
    https://www.pandoraholiday.com Pandora Necklaces Cheap For Sale
    https://www.laurenralphlauren.us Reasonable Price Ralph Lauren
    https://www.atlanticairjordan.com Exclusive Range Air Jordan
    https://www.lovekillsslowly.us Ed Hardy T Shirts USA
    https://www.atlantichogan.com Hogan Sneakers Reasonable Sale Price
    https://www.specialairshoes.com By Fashion Nike Air Max 97
    https://www.atlanticpandora.com Sale Pandora Gifts Christmas USA Online
    https://www.poloralphoutlet.us.com Super Quality Ralph Lauren Womens Shirts
    https://www.ggdbitaly.com Golden Goose Sneakers White
    https://www.prloutlet.co.uk cheap big Polo Ralph Lauren
    https://www.atlanticcoach.co.uk Cheap Coach Crossbody Outlet
    https://www.scarpehogans.it Unique Hogan Sneakers
    https://www.atlanticpolo.co.uk Ralph Lauren Polo UK
    https://www.coachfactory.uk Coach Shoulder Outlet
    https://www.edhardy.us.org Ed Hardy Black T Shirts
    https://www.pandorahearts.us.com Pandora Gifts Amazing Selection
    https://www.superstaradidas.us.com Adidas Boost Outlet Sale
    https://www.katespadeoutlet-store.us.com Kate Spade Lowest Price Online
    https://www.polooutletsfactorystore.us.com Shop Ralph Lauren Polos Best Sellers
    https://www.coach-bags.org us Coach light blue
    https://www.salomonshoes.in.net Salomon Speedcross Plus
    https://www.edhardysurprise.com ED Hardy Shop Online
    https://www.authentic-boost.com Lowest Price Adidas NMD Boost
    https://www.poloralphlaurenbusiness.com USA Polo Ralph Lauren
    https://www.ralphlaurenclassic.org.uk Polo Ralph Lauren ladies white
    https://www.adidasmix.com Adidas Yeezy Real Boost 350
    https://www.championoutlet.us.com Champion Factory Outlet Price
    https://www.coachus.us.com Coach Wallets outlet online official
    https://www.airmax-97.us.com Nike Air Max Plus USA Fashion
    https://www.justinairmax.com Nike Air VaporMax USA Online
    https://www.nike-factory.us.com Air Max 720 USA Online
    https://www.coachoutlet.org.uk Coach Handbags Wholesale UK
    https://www.palace.us.com Palace Jackets Outlet UK
    https://www.air-max2018.us.com Fashion Air Max 97 Store
    https://www.polooutletstore.us.org Ralph Lauren Dress For Women
    https://www.jordanshoesforsale.us.com Outlet Nike SB Dunk Online
  2. Jaehyeon
    감사합니다.
  3. hpyseun
    06/08/2020 완료
  4. 이승우
    완료
  5. 김수현
    '지옥에서 온 Git'강의와 똑 같아서...
    바로 전강의 '브랜치 합치기'에서 컨플릭트가 났을 때 해결했었는데...
    Resolve Conflicts > Mark Resolved부분에서 방법을 틀리게 했었네요.
    그냥 스태이징에어리어에 올리고 커밋버튼을 누르는 식으로 했습니다.
    결과(마지막부분)는 똑 같았습니다.

    똑 같이 따라하려다가 편집기에서 마크(====등)를 지우지 않고 했는데 다 되네요.
    Reset(과거로 되돌리기)하고 하려고 하니
    코드가 합쳐진 것이 커밋하지 않은 것으로 나오네요.
  6. Sangmook Kim
    170809 완료
  7. 헬리사우드
    전 처음 머깅부터 충돌이생겨서 바로 이거부터 봤네요
    이고잉님 강의는 이해가 정말 잘돼는것을 한번 더 느끼고 갑니다.
  8. ckyuseon
    좋은 강의 감사합니다.
  9. 류11
    출석.
  10. 이종훈
    감사합니다~
  11. 이주환
    2016. 04. 29
    편한 설명 잘보고 갑니다~!
  12. cham
    와 진짜 감사합니다.
  13. 김진렬
    감사합니다.
  14. 요네츄
    감사합니다!! 잘보고있어요!
  15. 김명순
    감사합니다
  16. 조신부리
    감사합니다
  17. 오후의아침
    감사합니다 덕분에 많이알아가네요^^
  18. 안녕하세여
    fatal: cannot do a partial commit during a merge.

    합병하고 수정후 commit 하면 이 에러가 나는데 왜그런걸까요 ㅠㅠ
  19. 트러스트킴
    Git 내부적으로 충돌 여부를 어떻게 검출하는지 궁금해졌는데요...
    한 파일 내의 데이터들의 상대적 위치 정보를 기억해두고 관리하는 걸까요?
  20. egoing
    수정했습니다. 덕분에 큰 혼란을 막았네요 ^^
    대화보기
    • egoing
      아 그러네요! 처리할께요
      대화보기
      • codudent
        방금까지만해도 브랜치 카테고리까지 업로드 되있었는데 원격저장소가 추가되었네요^^

        그런데 브랜치 하위 카테고리 순서가 변경이 된거같아요 브랜치 만들기와 합치기가 먼저왔던거같은데

        혹시 잘못된게 아닌가 싶어요
      graphittie 자세히 보기