search

Dinknesh / Traffic

0 stars 2 forks source link

Confilct problem #12

Closed IngAmanda closed 6 years ago

IngAmanda commented 6 years ago

Guys, i can't pull the modification of Jhana (login and register branch). I make some changes on my side. I rename some files, create package. I'm working on the issue but i need some help. please

JHANAGUSTAVE commented 6 years ago

what you will do is create another branch, pull the files, and make the changes you have to make. want it not to change too

IngAmanda commented 6 years ago

ok

KeitelDOG commented 6 years ago

When you push a branch, you have to merge it with the master branch with a pull request. Only after that the branch codes will be available in master. You don't need to pull the branch that your collaborators pushed, except if you want to correct it before you pushes it again and merges it.