$ git log 로그를 통해 commit id 찾는다.
$ git reset --hard 7c21ab3ea 7c21ab3ea에 해당되는 push 버젼으로 local branch reset를 한다.
$ git push origin +master 강제로 conflict를 무시하고 강제로 push
$ git stash stack 구조로 현재 local의 working tree 보관
$ git pop 위에 쌓은걸 꺼내오기
On branch master
Your branch is up-to-date with 'origin/master'.
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: build.gradle
modified: pom.xml
modified: target/classes/META-INF/MANIFEST.MF
modified: target/classes/META-INF/maven/com.sds.redca/redca-common/pom
.properties
modified: target/classes/META-INF/maven/com.sds.redca/redca-common/pom
.xml
Untracked files:
(use "git add <file>..." to include in what will be committed)
.settings/gradle/
no changes added to commit (use "git add" and/or "git commit -a")
Dropped refs/stash@{0} (138b61a50719cfd06e1d0bc93ae054de4f7afa29)
SDS@SDS-PC /d/workspace/redCAGit/redca-common (master)
$
