mag frontier alt mypackages sqlite3 git-status On branch master nothin

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
[mag@frontier:~/alt/mypackages/sqlite3]% git-status
# On branch master
nothing to commit (working directory clean)
[mag@frontier:~/alt/mypackages/sqlite3]1% git pull origin 'refs/heads/*:refs/heads/*'
Trying simple merge with ad375ca32880f81ce3bf6658b5af8ac40ca04d02
Simple merge did not work, trying automatic merge.
Auto-merging VERSION
ERROR: Merge conflict in VERSION
Auto-merging src/pager.c
ERROR: Merge conflict in src/pager.c
fatal: merge program failed
Automated merge did not work.
Should not be doing an Octopus.
Merge with strategy octopus failed.
[mag@frontier:~/alt/mypackages/sqlite3]2%