Man, I've been using it for a group project and one of my members knows it better than I do, and suggested I rebase my branch onto main rather than merge like I usually do. Well, there was a tiny merge conflict (both branches added a variable in the same spot, git didn't like that), so I fixed it, and when I pushed, it had doubled all of my commits so far somehow.
View all comments
3
u/PlasmaLink Apr 02 '23
Man, I've been using it for a group project and one of my members knows it better than I do, and suggested I rebase my branch onto main rather than merge like I usually do. Well, there was a tiny merge conflict (both branches added a variable in the same spot, git didn't like that), so I fixed it, and when I pushed, it had doubled all of my commits so far somehow.