[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Git error with current origin/master
[Thread Prev] | [Thread Next]
- Subject: Git error with current origin/master
- From: BB <adamnt42@xxxxxxxxx>
- Date: Tue, 4 Feb 2025 18:45:39 +1030
- To: Gambas Mailing List <user@xxxxxxxxxxxxxxxxxxxxxx>
Tried to update my gambas source today and got the following.I can fix the untracked "gb.db.sqlite2/FAILED" easily enough but does anyone have a clue about the strange "octopus"
tia bruce Fast-forwarding to: origin/master Trying simple merge with 83663fbbce833730cff32530c8ed998e2101ae5derror: Untracked working tree file 'gb.db.sqlite2/FAILED' would be overwritten by merge.
Merge with strategy octopus failed.