git - rozwiazywanie konfliktów

Witam,

Sklonowałem repozytorium, wprowadziłem pewnie zmiany.

W tym czasie inna osoba wprowadziła zmiany globalnie, użyłem git pull aby to pobrać

I występują u mnie chyba jakieś konflikty, ponieważ aplikacja działa nie poprawnie: (Wystąpił błąd podczas wysyłania, nieprawidłowe dane.).

Moze ktoś pomoc to rozwiązać?

metoda "brutalna": usuń wszystko i daj jeszcze raz git clone

ponadto jak ściągasz coś typu PHP, no to wiadomo: musisz ścieżki / zmienne, czy tam bazę poustawiać.
Może kwestia implementacji/instalacji/konfiguracji tego co ściągnąłeś, a nie tyle wina źle ściągniętych plików z repozytorium

A git status coś pokazuje?

On branch master
Your branch is ahead of 'piracy/master' by 7 commits.
  (use "git push" to publish your local commits)

Changes not staged for commit:
  (use "git add/rm <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        deleted:    app/cache/dev/annotations/7b337c13180da5f2b3d74d332dffcd4d7
fa57d8#indexAction.cache.php
        deleted:    app/cache/dev/annotations/7b337c13180da5f2b3d74d332dffcd4d7
fa57d8.cache.php
        deleted:    app/cache/dev/assetic/assets/6421a40d87c4abe4bec65831348afe
2
        deleted:    app/cache/dev/assetic/assets/86a2e963b694d07423cbec0f8b537a
e
        deleted:    app/cache/dev/assetic/assets/8970cf43e1b8bde2cf3a33845dafa8
d
        deleted:    app/cache/dev/assetic/assets/9ed270260cbe277a155094fbce81e4
d
        deleted:    app/cache/dev/profiler/01/db/6ddb01
        deleted:    app/cache/dev/profiler/0c/85/d0850c
        deleted:    app/cache/dev/profiler/1a/53/8d531a
        deleted:    app/cache/dev/profiler/28/a7/92a728
        deleted:    app/cache/dev/profiler/39/ed/c2ed39
        deleted:    app/cache/dev/profiler/5d/74/af745d
        deleted:    app/cache/dev/profiler/66/e8/6ce866
        deleted:    app/cache/dev/profiler/79/77/8f7779
        deleted:    app/cache/dev/profiler/86/25/d22586
        deleted:    app/cache/dev/profiler/90/99/149990
        deleted:    app/cache/dev/profiler/91/c1/01c191
        deleted:    app/cache/dev/profiler/a7/60/1060a7
        deleted:    app/cache/dev/profiler/bb/91/1391bb
        deleted:    app/cache/dev/profiler/db/61/7b61db
        deleted:    app/cache/dev/profiler/f4/5e/8a5ef4
        modified:   app/cache/dev/profiler/index.csv
        deleted:    app/cache/dev_old/annotations/12f52b14bf63db5b47c6215403d21
9a31497b2f#getListAction.cache.php
        deleted:    app/cache/dev_old/annotations/12f52b14bf63db5b47c6215403d21
9a31497b2f.cache.php
        deleted:    app/cache/dev_old/doctrine/orm/Proxies/__CG__OmnisoftIntegB
ndleEntityIntUser.php
        deleted:    app/cache/dev_old/profiler/19/01/af0119
        deleted:    app/cache/dev_old/profiler/1c/9f/299f1c
        deleted:    app/cache/dev_old/profiler/1e/54/dd541e
        deleted:    app/cache/dev_old/profiler/2e/4d/9d4d2e
        deleted:    app/cache/dev_old/profiler/30/92/b29230
        deleted:    app/cache/dev_old/profiler/3f/71/9c713f
        deleted:    app/cache/dev_old/profiler/49/d0/fcd049
        deleted:    app/cache/dev_old/profiler/4a/a6/d6a64a
        deleted:    app/cache/dev_old/profiler/52/03/280352
        deleted:    app/cache/dev_old/profiler/56/5b/8a5b56
        deleted:    app/cache/dev_old/profiler/62/e6/dae662
        deleted:    app/cache/dev_old/profiler/6a/18/ef186a
        deleted:    app/cache/dev_old/profiler/6b/84/34846b
        deleted:    app/cache/dev_old/profiler/6d/8d/bf8d6d
        deleted:    app/cache/dev_old/profiler/6d/cf/60cf6d
        deleted:    app/cache/dev_old/profiler/79/59/755979
        deleted:    app/cache/dev_old/profiler/81/a1/43a181
        deleted:    app/cache/dev_old/profiler/88/92/889288
        deleted:    app/cache/dev_old/profiler/8b/1f/8b1f8b
        deleted:    app/cache/dev_old/profiler/90/4b/ff4b90
        deleted:    app/cache/dev_old/profiler/94/27/eb2794
        deleted:    app/cache/dev_old/profiler/9a/33/7b339a
        deleted:    app/cache/dev_old/profiler/9d/6c/826c9d
        deleted:    app/cache/dev_old/profiler/ac/13/4413ac
        deleted:    app/cache/dev_old/profiler/b9/11/2a11b9
        deleted:    app/cache/dev_old/profiler/bf/64/0564bf
        deleted:    app/cache/dev_old/profiler/d8/76/b576d8
        modified:   app/logs/dev.log
        modified:   app/logs/dev_event_errors.log
        deleted:    app/logs/prod.log
        modified:   src/Omnisoft/AdminBundle/Resources/public/files/Thumbs.db
        deleted:    web/bundles/omnisoftadmin/files/forms/pl/letter/2(old).pdf
        deleted:    web/bundles/omnisoftadmin/files/forms/uk/bank/letter/1_do_u
un/List_Do_Banku.pdf
        deleted:    web/bundles/omnisoftadmin/files/forms/uk/bank/letter/2_do_u
un/List_Do_Banku.pdf

Untracked files:
  (use "git add <file>..." to include in what will be committed)

        app/cache/dev/profiler/13/e1/
        app/cache/dev/profiler/1f/
        app/cache/dev/profiler/20/5c/
        app/cache/dev/profiler/31/
        app/cache/dev/profiler/34/
        app/cache/dev/profiler/49/d4/
        app/cache/dev/profiler/4d/
        app/cache/dev/profiler/51/
        app/cache/dev/profiler/5f/
        app/cache/dev/profiler/6c/
        app/cache/dev/profiler/6f/
        app/cache/dev/profiler/94/
        app/cache/dev/profiler/9c/
        app/cache/dev/profiler/a4/
        app/cache/dev/profiler/a6/8f/
        app/cache/dev/profiler/c2/
        app/cache/dev/profiler/d1/
        app/cache/dev/profiler/dd/
        app/cache/dev/profiler/e2/24/
        app/cache/dev/profiler/e4/24/
        app/cache/dev/profiler/e9/c3/
        app/cache/dev/profiler/f4/e5/

no changes added to commit (use "git add" and/or "git commit -a")

Albo inna sprawa. Wyslalem na githuba commit, pozniej ta na sama galąz wyslalem drugi raz.

Jak moge pierwsza kopie przywrocic?

Może nie na to liczysz, ale polecam książkę: http://helion.pl/ksiazki/git-rozproszony-system-kontroli-wersji-wlodzimierz-gajda,gitroz.htm#szczegoly

ja miałem starsze wydanie i w dwóch miejscach bodaj było lekko nieaktualnie, ale generalnie świetna książka, która dobrze wyjaśnia zagadnienie, Pan Gajda w ogóle umie pisać