Boa tarde pessoas...eu aqui de novo
Fiz os passos mas não deu certo o git rebase:
alexandra.espindola@BRFLN-1KHHSV1 MINGW64 ~/Documents/git-e-github/alexandra (titulo)
$ git checkout titulo
Already on 'titulo'
alexandra.espindola@BRFLN-1KHHSV1 MINGW64 ~/Documents/git-e-github/alexandra (titulo)
$ git status
On branch titulo
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")
alexandra.espindola@BRFLN-1KHHSV1 MINGW64 ~/Documents/git-e-github/alexandra (titulo)
$ git add .
alexandra.espindola@BRFLN-1KHHSV1 MINGW64 ~/Documents/git-e-github/alexandra (titulo)
$ git commit -m "editado arquivo1 letra maiuscula"
[titulo 7e88a67] editado arquivo1 letra maiuscula
1 file changed, 1 insertion(+), 1 deletion(-)
alexandra.espindola@BRFLN-1KHHSV1 MINGW64 ~/Documents/git-e-github/alexandra (titulo)
$ git checkout master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
alexandra.espindola@BRFLN-1KHHSV1 MINGW64 ~/Documents/git-e-github/alexandra (master)
$ git rebase titulo
First, rewinding head to replay your work on top of it...
Applying: tentativa de merge
Using index info to reconstruct a base tree...
M arquivo1.txt
Falling back to patching base and 3-way merge...
Auto-merging arquivo1.txt
CONFLICT (content): Merge conflict in arquivo1.txt
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 tentativa de merge
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
alexandra.espindola@BRFLN-1KHHSV1 MINGW64 ~/Documents/git-e-github/alexandra (master|REBASE 1/3)
$
:(
