why do i break things

mail@pastecode.io avatar
2 years ago
2.4 kB
tburmeister@lokita:~/developer-portal$ git add --all
tburmeister@lokita:~/developer-portal$ git commit --amend
[review/alex_paskulin/fonts 2caa738] design: Use Wikimedia font styles
 Author: apaskulin <apaskulin@wikimedia.org>
 Date: Wed Jan 12 15:01:39 2022 -0800
 3 files changed, 449 insertions(+), 433 deletions(-)
tburmeister@lokita:~/developer-portal$ git pull --rebase origin master
fatal: couldn't find remote ref master
tburmeister@lokita:~/developer-portal$ git pull --rebase origin
remote: Counting objects: 232, done
remote: Finding sources: 100% (18/18)
remote: Getting sizes: 100% (5/5)
remote: Total 18 (delta 12), reused 18 (delta 12)
Unpacking objects: 100% (18/18), 1.57 KiB | 94.00 KiB/s, done.
From ssh://gerrit.wikimedia.org:29418/wikimedia/developer-portal
   00c7a8f..aadf268  main       -> origin/main
First, rewinding head to replay your work on top of it...
Applying: design: Use Wikimedia font styles
Using index info to reconstruct a base tree...
M	data/locale/en/LC_MESSAGES/mkdocs.po
M	mkdocs.yml
Falling back to patching base and 3-way merge...
Auto-merging mkdocs.yml
Auto-merging data/locale/en/LC_MESSAGES/mkdocs.po
CONFLICT (content): Merge conflict in data/locale/en/LC_MESSAGES/mkdocs.po
error: Failed to merge in the changes.
Patch failed at 0001 design: Use Wikimedia font styles
hint: Use 'git am --show-current-patch' to see the failed patch
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".
tburmeister@lokita:~/developer-portal$ git rm data/locale/en/LC_MESSAGES/mkdocs.po
rm 'data/locale/en/LC_MESSAGES/mkdocs.po'
tburmeister@lokita:~/developer-portal$ git rebase --continue
Applying: design: Use Wikimedia font styles
tburmeister@lokita:~/developer-portal$ git review -R
remote: Processing changes: refs: 1, updated: 1
remote: Processing changes: refs: 1, updated: 1
remote: Processing changes: refs: 1, updated: 1, done            
remote: SUCCESS        
remote:   https://gerrit.wikimedia.org/r/c/wikimedia/developer-portal/+/753578 design: Use Wikimedia font styles        
To ssh://gerrit.wikimedia.org:29418/wikimedia/developer-portal
 * [new branch]      HEAD -> refs/for/main%topic=fonts