I like Git's merging feature. For example, say there is an instance where I am working on the same code as another developer. Git automatically merges the work of two developers on the same file. If I'm working on line 50 and he's working on 60, and we both commit, it mergest automatically.
I like that it's easy to use and because it's accessible from a terminal or a graphical user interface if needed. I also like that we can pass comments from Linux if required.
DevOps Engineer at a tech services company with 51-200 employees
Jun 6, 2023
If other people are included in their project, you're going to have to make merge requests to merge the code you made, and the code your colleagues have made. So it's a little bit complicated.
If the file changes are on the same line, we need to resolve a merge conflict manually. Let's say there is a merge conflict on line 50 because we have multiple commits on the same line number. Git could add some artificial intelligence to resolve the conflict automatically.
Synchronization could be better. Sometimes when you create a branch and merge it into another branch, I think it's a bit complex for no reason. The initial setup is also tricky when you do it for the first time.
I would rate the initial setup process a four, on a scale from one to 10, with one being the most difficult and 10 being the easiest. The reason for this rating is that once there are conflicts, it takes a lot of effort to resolve them.
Professor at FESB - Faculty of Electrical Engineering, Mechanical Engineering and Naval Architecture
Jul 6, 2023
The main problem for me is the frequent upgrades in the solution because every other upgrade is a minefield. When you do the upgrade, there is always something that doesn't work.
