Git: add vs push vs commit

git add adds your modified files to the queue to be committed later. Files are not committed git commit commits the files that have been added and creates a new revision with a log… If you do not add any files, git will not commit anything. You can combine both actions with git commit -a … Read more

Git – Ignore files during merge

I got over this issue by using git merge command with the –no-commit option and then explicitly removed the staged file and ignore the changes to the file. E.g.: say I want to ignore any changes to myfile.txt I proceed as follows: git merge –no-ff –no-commit <merge-branch> git reset HEAD myfile.txt git checkout — myfile.txt … Read more

Hata!: SQLSTATE[HY000] [1045] Access denied for user 'divattrend_liink'@'localhost' (using password: YES)