Git error: merge not found
Peter Bjerg Mogensen
Apprently there is a bug with the version of git for openWRT, which affects the onion.
When doing a git pull on a already cloned depository I get the following
root@Omega-13E3:/usr/share/htdocs/api# git pull
/usr/lib/git-core/git-pull: exec: line 1: git-merge: not found
After doing a "find / -name 'git-core' it is reveiled that git is placed both in
Following what was written on this post https://dev.openwrt.org/ticket/11930 I mananged to fix the problem
The following command fixes it: "ln -s $(which git) /usr/lib/git-core/git"
As far as i get tell. This creates a symlink from the core lib to where git is called or something like that. Anyways it fixes the problem with merging and pushing
Is there any way for onion team to automatically check for instances of conflicting versions between overlay-fs installed packages and those already installed to the root flashed image? Or, am I altogether mixed up in my mental model such that seeing two 'git-core' entries from your find command is a misnomer?