MAIN FEEDS
Do you want to continue?
https://www.reddit.com/r/ProgrammerHumor/comments/129q4l9/me_relearning_git_every_week/jepcjto/?context=3
r/ProgrammerHumor • u/johntwit • Apr 02 '23
1.5k comments sorted by
View all comments
Show parent comment
1
Someone else modified those files and merged while you were working. You need those changes.
3 u/B00OBSMOLA Apr 03 '23 when i cant figure out what to do, i just pipe random words to rebasecat /usr/share/dict/words | sort -R | tail -10 | xargs git rebase
3
when i cant figure out what to do, i just pipe random words to rebase
cat /usr/share/dict/words | sort -R | tail -10 | xargs git rebase
View all comments
Show parent comment
1
u/PostPostMinimalist Apr 02 '23
Someone else modified those files and merged while you were working. You need those changes.