Closed alfredbez closed 9 years ago
Thanks!
The following is my personal memo to resolve conflict:
ghq get git@github.com:kohkimakimoto/LaravelAdminer.git git checkout -b alfredbez-patch-2 master git pull git://github.com/alfredbez/LaravelAdminer.git patch-2
I got the following messages.
remote: Counting objects: 3, done. remote: Compressing objects: 100% (1/1), done. remote: Total 3 (delta 2), reused 2 (delta 2), pack-reused 0 Unpacking objects: 100% (3/3), done. From git://github.com/alfredbez/LaravelAdminer * branch patch-2 -> FETCH_HEAD Auto-merging README.md CONFLICT (content): Merge conflict in README.md Automatic merge failed; fix conflicts and then commit the result.
I opened README.md by my editor and edited the conflict point.
README.md
git checkout master git merge --no-ff alfredbez-patch-2 git push origin master
Thanks!
The following is my personal memo to resolve conflict:
I got the following messages.
I opened
README.md
by my editor and edited the conflict point.