I experienced merge conflicts for the first time.

I. Hate. Them.

@CoffeeNcode I did and finished already. 😉👌

Now for the retest of everything, for when conflicts get out of whack.

@CoffeeNcode What's with all the cookies? It's not the first time I see smone hand out e-cookies. Is this some new trend, like a potato after a long post? :)

@CoffeeNcode CoffeeNcookie :3

You are using git? Then merge conflicts are easily solved using kdiff3.
However, you use git. So that's complaining on a really high level!
... you've never experienced merge conflicts with Harvest, CVS or subversion...

@Yamakuzure how do you use kdiff? What does it do?

@Yamakuzure yeah, but sometimes even git fuckes up.

$guy made a lot of changes in feature branch, $me makes a lot of changes in the same files, different feature branch. $guy creates a pull request to push changes to master, $me merges his changes to my feature branch. All good till this points, some conflicts, but nothing big.

The horror comes after I create a pull request, all the changes $guy makes in the files that are hit in both feature branches are highlighted as change. Hell of a job to review.

@L0we well... It sounds like git was doing just fine! 😊
Really, be thankful you weren't using svn. 😁
But I concur, merge conflicts are always nasty, even with git.

@Wombat kdiff3 is a three way comparison tool that can resolve most conflicts all by itself. Further it allows to combine and to edit changes.
I use it on Windows and Linux. Just use your favorite search engine with something like: "Howto git kdiff3"

They hate you too.