Merge Issues - <<<< HEAD syntax errors

[ghost]

Issue without proper information won't be answered

Expected Behavior

I want bot to START

Actual Behavior

$-MacBook-Pro:pokemongo-bot$ ./run.sh
Traceback (most recent call last):
File "pokecli.py", line 41, in
from pokemongo_bot import PokemonGoBot, TreeConfigBuilder
File "/Users/$/PokemonGo-Bot/pokemongo_bot/init.py", line 19, in
import cell_workers
File "/Users/$/PokemonGo-Bot/pokemongo_bot/cell_workers/init.py", line 3, in
from catch_lured_pokemon import CatchLuredPokemon
File "/Users/$/PokemonGo-Bot/pokemongo_bot/cell_workers/catch_lured_pokemon.py", line 8, in
from pokemongo_bot.cell_workers.pokemon_catch_worker import PokemonCatchWorker
File "/Users/$/PokemonGo-Bot/pokemongo_bot/cell_workers/pokemon_catch_worker.py", line 306
<<<<<<< HEAD
^
SyntaxError: invalid syntax
Thu Aug 11 18:18:10 PDT 2016 Pokebot Stopped.
Press any button or wait 20 seconds to continue.

Steps to Reproduce

./run.sh

Information

OS Yosemite 10.10.5
Git commit ( to get git commit run git log -1 --format="%H")
Python V: Python 2.7.10

[k4n30]

Wow, bad merge

I don't want to be that guy, but the one vital piece of information that would have been able to help us help you is the Information -> Git commit section that you omitted. If you could provide this info, and what branch you're on, we can sort this out relatively quickly.

[ghost]

Sorry how do i find this?

[DavidBindloss]

Git commit ( to get git commit run git log -1 --format="%H")

[ghost]

b8af467

[k4n30]

Ok well no one else is reporting this issue, so it doesn't look like a bad commit

Have you made changes to PokemonGo-Bot/pokemongo_bot/cell_workers/pokemon_catch_worker.py ? If not can you open the file and scroll to line 306 and see if you can see <<<<<<< HEAD anywhere around there

[lifesound7]

Hi,
i have the same issue today... And yes, it is <<<<<<< HEAD in line 306

[k4n30]

Hmmmm the plot thickens.....
@lifesound7 what commit are you on? is it the same as @thorowwasdf ? also can you post your details, ie OS, branch, commit etc

[lifesound7]

OS: OS X El capitan
Git Commit: 44d7b39
Python Version: Python 2.7.10

I guess an issue was with bot files, because It works after I have deleted files and reinstalled.

[k4n30]

@thorowwasdf can you try the same please, that was my next step before @lifesound7 said they had the same issue. Can you try a fresh install (remember to keep your config)

[cmezh]

It looks like it is not completed git merge.
Try:

git reset --hard
git pull origin dev

Or if you use master branch replace dev to master in the second line.

[k4n30]

@Ogalababa - #3679 (comment)

[ghost]

@cmezh thanks for the tip but it didnt work

[k4n30]

@thorowwasdf As this is not a bot issue, i'm going to close this issue. I'd suggest (like before) a fresh install (remember to keep your config)