N
N
nepster-web2014-07-17 01:07:38
Bitbucket
nepster-web, 2014-07-17 01:07:38

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
{
....

and because of this joke, pieces of the project are falling for me. Can you please tell me why bitbucket sometimes appends pieces of commits to a file?

Answer the question

In order to leave comments, you need to log in

1 answer(s)
A
anyd3v, 2014-07-17
@nepster-web

these are conflicts git-scm.com/book/en/Git-Branching-Basic-Branching-...
In the same link, read how to resolve.

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question