EDIT: one of the things should be aware of if you are using git bash is that BETTER TO KEEP AUTOCRLF FALSE
git config --global core.autocrlf false
========================================================
I'm new to git and I got problems deploying files...
I just pulled files successfully (?) using commands, and now I'm trying to push...
Commit Logs below: (I have several reverts because I have failed to commit several times due to LF, CRLF, or untracked Files errors)
And in AS I got "Push to origin/master was rejected"
The Error when pushing
hint: Updates were rejected because the tip of your current branch is behind
! refs/heads/master:refs/heads/master [rejected] (non-fast-forward)
Done
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
18:53:20.176: [Lab1_movie] git -c core.quotepath=false -c
log.showSignature=false pull --progress --no-stat -v --progress origin
master
From https://github.com/kiranofans/Lab1_MovieApp
* branch master -> FETCH_HEAD
= [up to date] master -> origin/master
fatal: refusing to merge unrelated histories
18:57:26.215: [Lab1_movie] git -c core.quotepath=false -c
log.showSignature=false push --progress --porcelain origin
refs/heads/master:master
github --credentials get: github: command not found
github --credentials store: github: command not found
error: failed to push some refs to
'https://github.com/kiranofans/Lab1_MovieApp.git'
To https://github.com/kiranofans/Lab1_MovieApp.git
! refs/heads/master:refs/heads/master [rejected] (non-fast-forward)
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
Done
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
You will try to send the command
git push -f origin master