'git-merge-conflict' Questions - SpiceQA

Questions Tags Users Badges

git-merge-conflict

54 Questions

Newest Active Unanswered Frequent

Git Merge Conflict - Remote File Deleted, Local File Changed

user_4756240

• asked Jul 25, 2012

23

2

19582

git-merge-conflict git-merge git

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

user_12848230

• asked Jan 15, 2010

209

2

113193

git-merge-conflict conflict merge git

How do I resolve merge conflicts in a Git repository?

user_37130

• asked Oct 2, 2008

5242

36

3274561

git-merge-conflict merge-conflict-resolution git-merge git

I ran into a merge conflict. How do I abort the merge?

user_186660

• asked Sep 19, 2008

3049

14

2374164

git-merge-conflict git-merge version-control git

Prev
2
3
4
5
6 (current)

Hot Questions