I am using Github to share our code among team members.
Currently using github desktop but have issues during pulling and pushing the code. Most of the <<< HEAD conflict issue.
Do you have any suggestion how to handle such kind of things during sharing code?
That's kinda part of the job, to resolve conflicts, ideal is that if you are in a team, your team members do not edit the same files as you but if that happens you need to resolve the conflicts if any.
There are several tools to make this a little bit easier
Thank you for your reply.
Yes, its true that its a part of our job too.
What are the best tools that you suggest to make our life easier?
Github released Gitkraken it looks like a great multi-platform tool to do the job
I personally do not use any tools, and resolve the conflicts my self with a text editor and use command line to merge.
Please or to participate in this conversation.