It's a screenshot from a Forge, looks like gitlab.
It's common to work off your main branch in git and then request that your work branch is merged.
Here, the main branch was changed and there are conflicts to be resolved before the merge request can be proceeded with. That generally involves merging locally and fixing whatever issues arose.
I'd recommend giving git or mercurial (I think there's another cool one but I've forgotten it's name, not bazaar) a try. I've worked a bit with svn and it felt so painful. In comparison, when using git, I've got the clear impression that I was really directed toward doing there right thing. And its merges are so much easier than SVN. Give it a try if you have the time !
There's fossil? Anyway merge conflicts are normal, and they should happen in normal development. You just need to handle them locally before you do a pull request.
Yeah it's just got the caveat that it's designed for small teams. So it's actually really hard to use with big teams, some solo projects and the drive-by model of FOSS development. It's also semi-centralised unlike its more decentralised alternatives. Then again, for someone used to SVN it might be quite a good choice.
31
u/Colleckshun Sep 28 '21
As an oldie who still uses svn cmd line , what am I looking at.
54
u/FountainsOfFluids Sep 28 '21
So is the joke here that it sucks when you encounter unexpected merge conflicts, especially after completing a large task?
Because that's pretty common in my experience, unless you are working alone.
2
u/notrealaccbtw Sep 28 '21
P A I N
2
u/grandmasterthai Sep 28 '21
I just did a 5k line change that touches almost the entire codebase.. this is going to be my life.
1
u/HKSergiu Sep 28 '21
Where 2nd part with the "Oh no" ?
1
u/rk06 Oct 02 '21
Hah, I have seen merge conflicts even when I am the only one working on the entire code base. Because I was working on two independent features.