search

ypxio / bekup-backend-class-malang

BEKUP 2.0 Backend Class Profile Site
https://bekup-backend-malang.herokuapp.com/
0 stars 4 forks source link

update Dev dari heri #2

Closed ypxio closed 8 years ago

ypxio commented 8 years ago

mas @heriwahyudianto bisa cek pull dulu ya, mau pull request branch dev ke master ternyata conflict

heriwahyudianto commented 8 years ago

git checkout -b dev origin/dev fatal: A branch named 'dev' already exists.

heriwahyudianto commented 8 years ago

okay, sudah berhasil merge ke master dan fix conflict