Category: GIT

create a new branch and sync it up

Identify which files are in conflict (Git should tell you this). Open each file and examine the diffs; Git demarcates them. Hopefully it will be obvious which version of each block to keep. You may need to discuss it with fellow developers who committed the code. Once you’ve resolved the conflict in the files stage …

If you haven’t cloned down the repo yet start with going into the folder where you want it and clone the repo. create temporary develop branch and move into it do all your changes you want todo Then keep using these 3 steps while working: add,commit and push the branch up. To keep the development …