Answer the question
In order to leave comments, you need to log in
Why are there glitches when updating a project with bitbucket ?
I actually work with git, I update my project with a team
through the bitbucket.org website. git pull
And sometimes I get this problem:
<?php
namespace business\modules\binary\widgets;
use Yii;
use yii\helpers\Html;
use business\modules\rangs\widgets\UserRang;
<<<<<<< HEAD
=======
use business\modules\users\helpers\UserPhoto;
>>>>>>> d9511d236cbdb45fa33f8f47a0d593da22fd7e07
class BlockUser extends \yii\bootstrap\Widget
{
....
Answer the question
In order to leave comments, you need to log in
Didn't find what you were looking for?
Ask your questionAsk a Question
731 491 924 answers to any question