Change to develop fail #21
Labels
No Milestone
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies
No dependencies set.
Reference: friendica/friendica-directory#21
Loading…
Reference in New Issue
No description provided.
Delete Branch "%!s(<nil>)"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
Wanted to change to develop and i get this on git pul out of the friendica folder
Merge is not possible because you do not have merged filesTry
git stash.Having said that there is no
developbranch here, onlymaster.then i get this on git pull
Automatic merge failed; resolve the conflicts and then commit the result.Maybe just reset?
git reset --hardnope, didnt help
Quite a mess. This is your Friendica installation, isn't it? Not the directory?
You need to do it manually. List what is modified with
git statusand then remove withgit rm [../dir/file]. Thengit pullagain...Btw, stay in master for a few days until some of the PRs are merged.
or i remove all files exept the config directory and then git pull again?
That wouldn't work unless you remove via the git command.
Easy way out use
git clone https://github.com/friendica/friendicaif you don't want to resolve it. But rename your old Friendica folder before. Copy the local config file into the new one.Please use
git pull --rebaseinstead.