I followed all the instructions on your website to create Repo, add file, pull and push files.
When I created Repo for the first time locally Master was created. It reflected contents same as the contents on remote(repo).
Other members who are using same Repo have added details to files and merged onto Repo. Now if I have to move my master to the latest, i tried to Pull request. there happens to be conflict on the pull request; how do i resolve it and update my master to lastest and point to the latest repo in Remote
I guess you are trying to update your changes in local, on master, and push it to remote? If so, try this:
1. Pull from remote master first. git pull origin master
2. If there are merge conflicts, address those
3. Commit the merged code locally
4. Push to remote. git push origin master
Free training for Jira, Confluence, and Jira Service Management Start faster and be more productive with Atlassian cloud products. Take the guess work out of where to begin, and gain confidence wi...
Connect with like-minded Atlassian users at free events near you!Find an event
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no Community Events near you at the moment.Host an event
You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events