How to merge code into git?

Question

git

I chose OpenServer for development. In everyday life there is a computer and a laptop, and a server is needed here and there. Now I have to push and pull at the end of the day. How can you || both servers, sometimes merging only the code of projects (domains)?

Answer 1

And that is how it is done. Pull from the repository, local commits, and then push back to the turnip, pull on the second computer, etc.