Alright we see this error and prompt of "Manually resolve these conflicts and push new changes to the source branch." at Azure DevOps when we push up from GitHub Desktop and there is a merge conflict. You can pull the branch you wish to merge against down into your current branch with GitHub Desktop or with a command tool such as Git Bash like so:
git pull origin WHATYOUWANTTOMERGEAGAINST
Resolve your conflicts and recommit!
No comments:
Post a Comment