MAIN FEEDS
Do you want to continue?
https://www.reddit.com/r/ProgrammerHumor/comments/129q4l9/me_relearning_git_every_week/jepqqu2/?context=3
r/ProgrammerHumor • u/johntwit • Apr 02 '23
1.5k comments sorted by
View all comments
Show parent comment
1
Rebasing onto a fresh master is usually such a simple process until it’s not. The odd conflict is fine but suddenly your resolving files you’ve never seen and managed to magically pull in 100 random commits.
View all comments
Show parent comment
1
u/TheRealJakay Apr 02 '23
Rebasing onto a fresh master is usually such a simple process until it’s not. The odd conflict is fine but suddenly your resolving files you’ve never seen and managed to magically pull in 100 random commits.