git-merge-conflict Archives

How can I discard remote changes and mark a file as “resolved”?

I have some local files, I pull from remote branch and there are conflicts. I know that I would like to keep my … Read more

I just merged a branch into my master in git and I got Automatic merge failed; fix conflicts and then commit the result. … Read more

I am in the middle of rebasing after a git pull –rebase. I have a few files that have merge conflicts. How can … Read more

I ran a git pull that ended in a conflict. I resolved the conflict and everything is fine now (I used mergetool also). … Read more

This question already has answers here: Git merge left HEAD marks in my files (5 answers) Closed 9 years ago. After I pulled … Read more

I just need a plain list of conflicted files. Is there anything simpler than: git ls-files -u | cut -f 2 | sort … Read more

I am on branch mybranch1. mybranch2 is forked from mybranch1 and changes were made in mybranch2. Then, while on mybranch1, I have done … Read more

How do I resolve a git merge conflict in favor of pulled changes ? Basically I need to remove all conflicting changes from … Read more

I used git pull and had a merge conflict: unmerged: _widget.html.erb You are in the middle of a conflicted merge. I know that … Read more

I want to resolve merge conflicts in my Git repository. How can I do that? 3 36