Monday 19 July 2021

Gitpull daily

 To update new github everyday (for vial and qmkfirmware to do accordingly)

git pull

 

To clean previous files when merging/.deleting

git stash

git pull 

git stash pop 

cygwin_exception::open_stackdumpfile: Dumping stack trace to make.exe.stackdump

new problem exist

to solve it, delete the keyboards folder that you are not using. for example, my case delete the number folder before abc. problem solves. 


 

this could be a temporary problem but it works



// Advice from solartempest

  1. git fetch upstream master
  2. git pull upstream master

Error

error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.


// Try to check from https://stackoverflow.com/questions/26376832/why-does-git-say-pull-is-not-possible-because-you-have-unmerged-files
            git add .
            git commit
Error Stuck at BOT mode
 
// Try git fetch upstream master, then git pull upstream master
hence From https://github.com/qmk/qmk_firmware
// then again
            git pull
// cant pull
            git stash
            git pull
// updating
still not working
 
 
⚠ Submodule lib/chibios is not up to date!
 

make git-submodule

synchronizing

.... not working


//rework

git fetch upstream master git pull upstream master end up: error: Pulling is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm <file>' hint: as appropriate to mark resolution and make a commit. fatal: Exiting because of an unresolved conflict. so i git status all the changes appeared, and qmk msys advises me to Untracked files: (use "git add <file>..." to include in what will be committed) lib/ugfx/


 Changes to be committed:
(use "git restore --staged <file>..." to unstage)
deleted: keyboards/0_sixty/0_sixty.c

 .....

 Unmerged paths:
(use "git restore --staged <file>..." to unstage)
(use "git add/rm <file>..." as appropriate to mark resolution)
deleted by them: keyboards/0_sixty/info.json

 Changes not staged for commit:
(use "git add/rm <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
(commit or discard the untracked or modified content in submodules)
deleted: keyboards/0_sixty/underglow/config.h

 Untracked files:
(use "git add <file>..." to include in what will be committed)
lib/ugfx/


It took 3.88 seconds to enumerate untracked files. 'status -uno'
may speed it up, but you have to be careful not to forget to add
new files yourself (see 'git help status').

 

 

 

 

 

 

 

at