search

smarthomeNG / smarthome

Device integration platform for your smart home
https://www.smarthomeNG.de
GNU General Public License v3.0
123 stars 92 forks source link

Merging problem: Backend Plugin 1.1.3 has trash lines in it #105

Closed onkelandy closed 8 years ago

onkelandy commented 8 years ago

line 392 <<<<<<< HEAD line 404 ======= line 413 >>>>>>> a8640399987a121b7963accdd333300f16f56961

Same problem several lines below.

Or is that just a local github problem?

psilo909 commented 8 years ago

where do u see those in https://github.com/smarthomeNG/smarthome/blob/develop/plugins/backend/__init__.py

onkelandy commented 8 years ago

Hmmm, actually nowhere. As exactly the same thing happened after merging release-1.2 with the latest develop on two separate installations (only in the backend plugin and nowhere else) I thought that somehow somewhere there might be a problem. But actually just after merging.

Github is still a mystery for me - so if it only happens for me just delete the issue ;)

thernst-de commented 8 years ago

That's a merge conflict that git can not solve automatically. Between <<<<<<< HEAD and ======= you can find the coding from your current version, between ======= and >>>>>>> a864039 is the coding change from commit a864039. You need to resolve the conflict manually (e.g. by choosing which of both versions you want to use, or combine both versions) and remove the markers. Then you can "git add" the conflict file and "git commit" to continue the merge.

onkelandy commented 8 years ago

Sometimes reading helps.. thanks alot ;)

ohinckel commented 8 years ago

So I think we can close this.