μΌ | μ | ν | μ | λͺ© | κΈ | ν |
---|---|---|---|---|---|---|
1 | 2 | 3 | 4 | 5 | 6 | |
7 | 8 | 9 | 10 | 11 | 12 | 13 |
14 | 15 | 16 | 17 | 18 | 19 | 20 |
21 | 22 | 23 | 24 | 25 | 26 | 27 |
28 | 29 | 30 | 31 |
Tags
- raywenderlich
- Lv2
- reactorkit
- visionOS
- ν¨μ€νΈμΊ νΌμ€
- arkit
- Xcode
- RxSwift
- CollectionView
- swift
- SnapKit
- BOJ
- Swfit
- λ°±μ€
- realm
- UIKit
- MVVM
- TCA
- combine
- ios
- BFS
- node.js
- νλ‘κ·Έλλ¨Έμ€
- XCTest
- Flutter
- Kuring
- SwiftUI
- designpattern
- rxcocoa
- tableView
Archives
- Today
- Total
lgvv98
[git] μ격 μ μ₯μμμ λ΄μ© λ³κ²½ ν local μ μ₯μλ‘ pull λ³Έλ¬Έ
git
[git] μ격 μ μ₯μμμ λ΄μ© λ³κ²½ ν local μ μ₯μλ‘ pull
π₯ μΊλΏλ§¨ 2021. 11. 30. 01:31β μ격 μ μ₯μμμ README.md νμΌμ μ§μ λ³κ²½ν ν, λ‘컬 μ μ₯μμ λ°μνλ λ²μ λν΄μ μμλ³Ό μμ μ΄μΌ.
μ격 μ μ₯μμ μ κ·ΌνκΈ° μν΄ μ격 μ μ₯μ λ΄μ© μ λ°μ΄νΈ ν, git pull
$ git remote update
$ git stash
$ git pull
git stashλ 1λ²μ΄ν 3λ²(2λ²μ 건λλ°κ³ ) μ€ννμ μ,
error: Your local changes to the following files would be overwritten by merge:
README.md
Please commit your changes or stash them before you merge.
Aborting
μμ κ°μ μλ¬κ° λλ©΄ 2λ²μ λ£μ΄μ μ²λ¦¬ν΄μ£Όλ©΄ λ
'git' μΉ΄ν κ³ λ¦¬μ λ€λ₯Έ κΈ
[git] xcode .gitignore (2) | 2022.08.08 |
---|---|
[git] μμ€νΈλ¦¬ μ μ gitignore ν΄κ²°νκΈ° (0) | 2022.07.12 |
[git] git stash (0) | 2022.02.24 |
[git] ν΄λμμ νΉμ νμΌ Commit & push (0) | 2022.01.21 |
π€¦ββοΈ git μ격 μ μ₯μμ μ¬λΌκ° commit λλ리기 (0) | 2021.06.26 |
Comments