Resolve a binary file conflict with Git - Crazy incident with small sqlite database that was committed in git
Crazy incident with database that was committed in git. This one actually turned out okay
After command
git checkout --theirs -- db.sqlite3
resolve a binary file conflict with Git
Then I saw that there are differences I tried to come back to a stash but
warning: Cannot merge binary files: HEAD:somefile.dll vs. otherbranch:somefile.dll Auto-merging somefile.dll CONFLICT (content): Merge conflict in somefile.dll Automatic merge failed; fix conflicts and then commit the result.
So in state of history shortcut for getting the copy from the other version.
git checkout --theirs -- db.sqlite3
History..
2253 git status
2254 git stash
2255 git stash list
2257 git stash apply 2
2258 git status
2259 ls
2260 rm db.sqlite3
2261 ls
2262 git stash status
2263 git stash show
2264 git stash list
2265 git stash applay stash@{2}
2266 git stash apply stash@{2}
2267 git reflog
2269 git checkout 1940c00
2270 git status
2271 ls
2272 git add db.sqlite3
2273 git status
2274 git restore --staged db.sqlite3
2275 git status
2276 git restore db.sqlite3
2277 git status
2278 git restore db.sqlite3
2279 git stash show
2280 git stash list
2281 git stash apply stash@{2}
2282 git status
2283 git restore --staged db.sqlite3
2284 git restore db.sqlite3
2285 git stash apply stash@{2} --ours
2286 git stash apply stash@{2}
2287 git checkout --ours db.sqlite3
2288 git status
2289 ls
2290 git checkout --theirs -- db.sqlite3
2291 git status
root@Ubuntu-2010-groovy-64-minimal /home/sites/auto-verkopen-belgie/djangopageadmin # git reflog
edb82c9 (HEAD -> master) HEAD@{0}: reset: moving to HEAD
edb82c9 (HEAD -> master) HEAD@{1}: reset: moving to HEAD
edb82c9 (HEAD -> master) HEAD@{2}: commit: Strange database issue
f0cb475 (origin/master) HEAD@{3}: pull: Fast-forward
1940c00 HEAD@{4}: reset: moving to HEAD
1940c00 HEAD@{5}: commit: Afbeeldingen en datatabse van -
ce8e554 HEAD@{6}: pull: Fast-forward
fecd04d HEAD@{7}: commit: Afbeeldingen toegevoegd aan Infopages
892b3e1 HEAD@{8}: commit: Herschrijven aantal pagina's database backup
06d92eb HEAD@{9}: pull: Fast-forward
c1b5a3d HEAD@{10}: commit: Ikwilvanmijautoaf crawler started
5e0779b HEAD@{11}: commit: Database changes
f8af5b0 HEAD@{12}: pull: Fast-forward
54eb69c HEAD@{13}: commit: Afbeeldingen bewaard en databse changes.
38a8003 HEAD@{14}: commit: Images added in Artikels and cars
8bbee35 HEAD@{15}: commit: 100 images toegevoegd
efa1d83 HEAD@{16}: commit: Images added in admin
b853b15 HEAD@{17}: commit: Alle artiekels van - zijn herschrijven..
2931a0a HEAD@{18}: commit: Copyscape kan ik opstarten met verschillende combinaties
a2c9ec2 HEAD@{19}: commit: Database is fixed omdat we image toegevoegd
3ae34b5 HEAD@{20}: commit: import page command added
41f0de0 HEAD@{21}: pull origin master: Merge made by the 'recursive' strategy.
d5b27c5 HEAD@{22}: commit: DB changeges
e50bd8d HEAD@{23}: commit: Database
32eba66 HEAD@{24}: commit: Template updated for copyscape
eb27e98 HEAD@{25}: commit: Django interface updated for beter usability and removed small problems
Comments
Post a Comment