Stack Overflow
Stack Overflow

Questions tagged [git-merge-conflict]

Questions about resolving merge conflicts in Git.

See also

518 questions
0
votes
1 answer

Avoid spurious git conflicts for apend-only files

We have a few files (such as message catalogs) where the line order is not meaningful, and the practice is always to append new lines. This causes git conflicts: git has no info on the proper order. Marking that as a conflict is, of course, the…
jackr
  • 1,407
  • 1
  • 14
  • 29
0
votes
1 answer

git pull -X theirs local master still have conflicts

I would like to make pull by accepting all remote (theirs) modifications, without any manual conflict solving. However I still get conflicts without auto solution: $ git merge -s recursive -X theirs local/master CONFLICT (rename/delete):…
klor
  • 1,237
  • 4
  • 12
  • 37
0
votes
1 answer

See all GIT conflicts on terminal window

I would like to know if GIT has a command that allows me to see all conflicts and conflicts per file on the terminal window. I would like to see only the conflicts on the terminal window without having to open the file on a code editor (either an…
Gabriel Ferraz
  • 592
  • 6
  • 26
0
votes
0 answers

GIT - Way to track file changes in your team and warn about potential conflicts

I am looking for a way/tool to to get notified if someone else on my team is editing the same file as I am. This is in order to prevent conflicts when merging later. It's not about locking the file, but only about turning your attention to it (and…
Stan
  • 2,151
  • 1
  • 25
  • 33
0
votes
1 answer

Git interactive rebase - any way to instruct git to resolve conflicts keeping the HEAD version?

Tried variations of git rebase -i -Xours master but still conflicts are shown and I have to resolve them manually. Plus it's not entirely clear what happens with non conflicting changes in the case of a conflicting commit - are those kept ? Use…
Mr_and_Mrs_D
  • 32,208
  • 39
  • 178
  • 361
0
votes
2 answers

Git merge conflict on multiple files

How can I tell git to take all conflicted files from one specific branch? I have a merge conflict while merging branch1 to branch2. Can I say take all conflicted files from branch1 instead of adding each file.
Shiju Samuel
  • 1,373
  • 6
  • 22
  • 45
0
votes
1 answer

git does not merge all files after resolving conflict

So I'm not sure if this is a known issue, but lets go through what happened: I create a feature branch off master, and start working on my feature Master is being updated with other features which I don't have in my own feature branch yet. I am…
user2221830
  • 163
  • 2
  • 11
0
votes
3 answers

Git merge conflict with workspace.xml

I'm trying to push my Rails project to Heroku, but Git isn't allowing me to do anything at the moment. Here's what I've done so far: git push heroku failed because the heroku branch was "ahead" of my local branch, which should not have been…
Atte Juvonen
  • 4,922
  • 7
  • 46
  • 89
0
votes
2 answers

I want my coworker's git merge conflict markers to show up on my computer

Summary: I want the git conflict markers to show up on my computer so that I can resolve the conflicts in a text file. How can I do that? Situation: I write a text file. I check in the text file. My coworker makes changes to the text file. I…
Roy Harper
  • 5
  • 4
0
votes
1 answer

Git bundler conflicts in gemlock with aptana

How can I resolve conflicts like -BUNDLED WITH - 1.10.6 In my gemlock file everytime when I take pull and merging into some other branch. It also abort stash applying before that.
Jaswinder
  • 1,455
  • 14
  • 27
0
votes
1 answer

How can I mark a file conflicted

I've been working on a project with another developer and he recently committed and pushed a file that was conflicted and unresolved. Furthermore, he merged this file to our main branch. Today I, after numerous commits, pushes, and merges, noticed…
Tanshaydar
  • 28
  • 4
0
votes
1 answer

Git rebase master - resolving conflicts after files on origin remote master were renamed

After pulling updates from the origin remote, master branch, I've checked into my local dev branch & tried to git rebase master. There were a few conflicts. Whilst most of these were simple to resolve, I'm stuck on the conflicts where files have…
ldn_34
  • 11
  • 1
0
votes
2 answers

How do I keep merge in Git from overwriting all my master's changes since the branch was first created?

I create a branch, "test1," change a file, and do not merge it back in master. I forget about the test for a week. I made lots of changes in master since that test1 branch. But, then I decide I still like that one feature in test1 that I did, a…
johnny
  • 19,272
  • 52
  • 157
  • 259
0
votes
1 answer

Configure merge options for a particular remote repository in git?

I'd like to use a particular merge option ('ours') for the recursive strategy when pulling from a particular remote repository, but not others. I know about git config branch..mergeoptions "-Xours", but that's per-branch rather than per-remote…
bsmith89
  • 223
  • 2
  • 6
0
votes
0 answers

Git conflict but no one line showing

I have conflict on the GIT then i try merge code, but not showing what lines conflicting. my file and main branch source file is equal line by line..
Your choice
  • 395
  • 12
  • 25
1 2 3
…
34 35