Bom dia!
Faço o passo a passo conforme a aula, e aparecem algumas diferenças =/
após alterar o meu arquivo, dou um git status, porém no meu caso aparece: Your branch is ahead of 'origin/master' by 2 commits. (use "git push" to publish your local commits) nesse caso eu realizei o push
$ git status
On branch master
Your branch is ahead of 'origin/master' by 2 commits.
(use "git push" to publish your local commits)
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: arquivo1.txt
no changes added to commit (use "git add" and/or "git commit -a")
$ git push
Enumerating objects: 8, done.
Counting objects: 100% (8/8), done.
Delta compression using up to 8 threads
Compressing objects: 100% (6/6), done.
Writing objects: 100% (6/6), 628 bytes | 628.00 KiB/s, done.
Total 6 (delta 2), reused 0 (delta 0)
remote: Resolving deltas: 100% (2/2), completed with 1 local object.
To https://github.com/AlexandraEspindola/alura-git.git
ab49fcf..5c8335a master -> master
Realizo um novo git status. Aí, aparece "Your branch is up to date with 'origin/master'." que seria "seu branch está atualizado em relação ao master, certo? De qqr forma, aparece o modified.
$ git status
On branch master
Your branch is up to date with 'origin/master'.
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: arquivo1.txt
Realizo o git add
$ git add arquivo1.txt
E depois o commit
$ git commit -m "tentativa de abrir o vim"
[master 5f24aaa] tentativa de abrir o vim
1 file changed, 1 insertion(+), 1 deletion(-)
Ai finalmente o git merge
$ git merge titulo
Already up to date.
E então...nada do vim :( ainda, se eu dou novamente git status aparece o seguinte:
$ git status
On branch master
Your branch is ahead of 'origin/master' by 1 commit.
(use "git push" to publish your local commits)
nothing to commit, working tree clean
O que quer dizer esse "your branch is ahead of (origin/master) by 1 commit"?