I use IntelliJ Idea with Git. When I pull from repository, I get following error:
" ...CONFLICT (content): Merge conflict in server..."
Then pull fails.
Questions are:
After a git merge stops due to conflicts you can conclude the merge by running git merge --continue (see "HOW TO RESOLVE CONFLICTS" section below). Commits, usually other branch heads, to merge into our branch.
Looks like you've got a conflict during merge. Go to the Changes
View and see if there are any unmerged files. Then invoke Resolve Conflicts
, choose what to take from your changes and theirs, and commit.
You may also want to try Update Project
for more intelligent pulling from the tracked branch.
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With