fiz o que disse e parece que deu certo... porém o meu sketch.js ainda esta dando como erro (quando executo o pull, como pede o terminal). não sei o que fazer nele para não dar esse conflito.
$ git add .
warning: in the working copy of 'bash.exe.stackdump', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'sh.exe.stackdump', LF will be replaced by CRLF the next time Git touches it
Nilton@Nilton-PC MINGW64 ~/desktop/Night-Mode (main)
$ git commit . -m"teste apos add os arquivos"
warning: in the working copy of 'bash.exe.stackdump', LF will be replaced by CRLF the next time Git touches it
warning: in the working copy of 'sh.exe.stackdump', LF will be replaced by CRLF the next time Git touches it
[main 865d516] teste apos add os arquivos
7 files changed, 142 insertions(+)
create mode 100644 bash.exe.stackdump
create mode 100644 sh.exe.stackdump
create mode 100644 sketch_BACKUP_1570.js
create mode 100644 sketch_BASE_1570.js
create mode 100644 sketch_LOCAL_1570.js
create mode 100644 sketch_REMOTE_1570.js
Nilton@Nilton-PC MINGW64 ~/desktop/Night-Mode (main)
$ git status
On branch main
Your branch and 'origin/main' have diverged,
and have 6 and 6 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
nothing to commit, working tree clean
Nilton@Nilton-PC MINGW64 ~/desktop/Night-Mode (main)
$ git pull origin main
From https://github.com/vitorr2101/Night-Mode-Dc-Heroes
* branch main -> FETCH_HEAD
Auto-merging sketch.js
CONFLICT (content): Merge conflict in sketch.js
Automatic merge failed; fix conflicts and then commit the result.
Nilton@Nilton-PC MINGW64 ~/desktop/Night-Mode (main|MERGING)
$ git reset --mixed
Unstaged changes after reset:
M sketch.js
Nilton@Nilton-PC MINGW64 ~/desktop/Night-Mode (main)
$ git status
On branch main
Your branch and 'origin/main' have diverged,
and have 6 and 6 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: sketch.js
no changes added to commit (use "git add" and/or "git commit -a")
Nilton@Nilton-PC MINGW64 ~/desktop/Night-Mode (main)
$ git add sketch.js
Nilton@Nilton-PC MINGW64 ~/desktop/Night-Mode (main)
$ git commit . -m"teste apos add o sketch.js"
[main 3542bec] teste apos add o sketch.js
1 file changed, 3 insertions(+)
Nilton@Nilton-PC MINGW64 ~/desktop/Night-Mode (main)
$ git push origin main
fatal: Ocorreu um erro ao enviar a solicitação.
fatal: A solicitação foi anulada: Não foi possível criar um canal seguro para SSL/TLS.
remote: Support for password authentication was removed on August 13, 2021.
remote: Please see https://docs.github.com/en/get-started/getting-started-with-git/about-remote-repositories#cloning-with-https-urls for information on currently recommended modes of authentication.
fatal: Authentication failed for 'https://github.com/vitorr2101/Night-Mode-Dc-Heroes.git/'