0

source image

scene image

After pull (rebase), my source code and scene file is strange.

All change code have strange code

I can't open unity scene... help me please

kowsky
  • 12,647
  • 2
  • 28
  • 41
Guijeogi
  • 1
  • 3
    That just looks like merge conflicts? like you pulled down code after having made changed without pushing them to the repo? – Gibbon Jul 04 '18 at 07:57
  • I did commit -> push -> pull (rebase) in that order. – Guijeogi Jul 04 '18 at 08:04
  • maybe merge conflicts. Is there any easy way to solve it? – Guijeogi Jul 04 '18 at 08:16
  • I'd recommend using the git CLI unless you have good reasons to use a GUI. It helps to demystify git and to understand how it works. Also don't immediately rebase. You won't be able to tell what is going on. Again, I suggest doing it step by step in the CLI. – Zyl Jul 04 '18 at 08:32
  • Thank you!! solved merge conflict – Guijeogi Jul 04 '18 at 09:15

0 Answers0