search

friendica / friendica-directory

Global directory for the Friendica project. The repository has moved to git.friendi.ca/friendica/friendica-directory
GNU Affero General Public License v3.0
20 stars 11 forks source link

Your configuration indicates the merge with reference 'refs / heads / master' of the remote repository #69

Closed ghost closed 3 years ago

ghost commented 3 years ago

Getting this after a git pull

Your configuration indicates the merge with reference 'refs / heads / master' of the remote repository, but this reference was not requested.

tobiasd commented 3 years ago

Which branch are you using? git branch will list them all and your current one will be marked with an *

MrPetovan commented 3 years ago

You don't need to worry about this, it will show once because the master branch has been deleted, and it won't show ever again. Just use the stable branch.

ghost commented 3 years ago

Okay i changed it from master to stable and now it update database cheme from 5 to 8