Hey guys,
thank you so much for your input!!!
we took the time to compare a lot of git clients during the last days.
It turned out, that the perfect solution for us is the following:
- As GUI client we use GitHb Desktop. It’s easy and lightweight and it has all the stuff we need. The console is fast opened, if you also want to do some terminal git commands. Also the one-click-checkout is easy to use if you are aware, that this changes your branch code immeditaly.
- Our Git hoster, GitLab is one of the best services I experienced from a business tool. We use their in-build merge request feature, which merges the different branches without any distraction or diff problems.
- We switched our branch usage from developer branches to feature branches. So we now have a lot of branches open (for every feature we’re working on), but the code changes are smaller. Merges getting easier since this.
- I’ve set up a workflow, which saves a codebase before pushing to a custom folder on my mac, just in case some code is lost after pushing or merging, what we experienced during the last weeks.