You're on your way to the next level! Join the Kudos program to earn points and save your progress.
Level 1: Seed
25 / 150 points
1 badge earned
Challenges come and go, but your rewards stay with you. Do more to earn more!
What goes around comes around! Share the love by gifting kudos to your peers.
Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!
Join now to unlock these features and more
Hello folks, just a heads up the last paragraph is a rant so feel free to skip it.
Like the title says, SourceTree has gotten the idea that when I merge work with another branch, it should revert changes.
Now, I am not talking about merge conflicts and the possibility that I am resolving the issue "theirs" in stead of "mine" (or the reverse) but rather it decides to revert stuff things to a state 2 weeks or 15 commits ago or something fucking STUPID like that. Additionally, the state of each branch is such that neither is using the stuff it is reverting to!
How the FUCK does this keep happening and what the hell do I need to do to make these programs do what they're fucking supposed to?
Is this a Git issue or some stupid shit SourceTree is doing? I know SourceTree is just a Git GUI and isn't, or shouldn't be, doing anything under the hood and it just shows me some info, but I have been noticing a lot of absolute horseshit from using SourceTree that I don't get in GitHub Desktop and other programs. Not to get too ranty but I am starting to find no value in this god forsaken program. I am starting to spend close to half my fucking time reimplementing shit from months ago.