3/5/2023 0 Comments Best git clients for mac![]() ![]() There are merge conflicts because he started with code that was several commits behind my latest on my master branch not my develop branch. Right now I’ve got a huge amount of code that handles his newly designed bluetooth scale that I need to integrate with my latest code. It is in work to change his development mode but that doesn’t help the immediate issue. My husband is starting to do more development and he tends to develop in the Master branch not my develop branch. Now I need a way to handle merge conflicts by viewing code side by side and telling the system which to use or creating a third edited file that has cherrypicked the code I want. ![]() I used to use GitHub Desktop and it worked fairly well but I didn’t have many other collaborators and few merge issues. Title says it all, I’ve got to delve a lot more into doing Git on my mac since I’ve moved off GitHub into GitLab with LambTracker and am looking for a good gui git client.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |