Merge conflict when merging develop into local branch.

djog / djog_unos_2019

Project by the Uno's at DJOG 2019-2020

https://github.com/djog/dojo

GNU General Public License v3.0

3 stars 1 forks source link

Merge conflict when merging develop into local branch. #75

Closed janderkkotlarski closed 5 years ago

janderkkotlarski commented 5 years ago

I'm encountering a merge conflict when merging develop into my local branch and it's driving me insane, because I have no interest solving merge conflicts between master and develop outside of my own local branch, because I assume I will have to solve this each and every time I want to keep my local branch updated.

What do?

richelbilderbeek commented 5 years ago

AFAIK, there are some difficulties with merging, due to the Java and IDEA setup.

I will assign medior @Rijk-van-Putten to help you out.

janderkkotlarski commented 5 years ago

Ugh, Java and IDEA spaghettios...

richelbilderbeek commented 5 years ago

It's part of the learning curve :rainbow: :+1:

janderkkotlarski commented 5 years ago

It' s clear now.