search

bigframeteam / BigFrame

BigFrame is not a single benchmark, it is actually a benchmark generator!
6 stars 5 forks source link

Push failed for the branch "workflow" #5

Closed andyhehk closed 10 years ago

andyhehk commented 11 years ago

Hi all,

I encountered conflict when I tried to push my code to the branch "workflow". It seems that someone and I are modifying the same codes at the same time. I want to resolve the conflict, and it needs to delete some files.

Advise: If we want to make some changes on the same branch next time, can we synchronize with each other first?

ghost commented 11 years ago

Sorry about your inconvenience. From the next time, I will let you know about the change before I push to the repository.