Stack Overflow
Stack Overflow

Questions tagged [merge-conflict-resolution]

When merging branches in a version control system, a merge conflict might arise. This tag is for questions about how such conflicts can be resolved.

See also

755 questions
0
votes
1 answer

Diverged Branches in GitHub

I tried to sync my local repository with the remote one on the GitHub site, but I keep getting an error. However, I don't really know how to fix it. Can someone help me figure out what's going on? I'm new to using GitHub, and it doesn't make much…
user3479415
  • 1
  • 1
0
votes
1 answer

Splitting a merge up for different people to handle

We have a single repo for an app that has multiple modules/sub-apps (not git submodules), written by multiple people. Each is separated into subfolders: /topFolderInGit --/module1SubDir --/module2SubDir ... We have two branches under active…
ray
  • 1,966
  • 4
  • 24
  • 39
0
votes
0 answers

Can I Configure SVN To Resolve My Conflict Better?

I use KDiff3 as my external merge tool with SVN and very frequently it automatically merges all the conflicts that SVN fails on with no interaction from me. Is there a setting to give SVN more context or something else that might help it resolve the…
opticyclic
  • 7,412
  • 12
  • 81
  • 155
0
votes
1 answer

Collaborative Merge Conflict Resolution in Tortoise SVN

Imagine the following scenario: when trying to merge the changes on the trunk with a branch, there are conflicts on 10 different files which are authored and maintained by 3 different developers. This means that a single team member cannot conduct…
Narek Malkhasyan
  • 1,332
  • 1
  • 12
  • 22
0
votes
0 answers

Git - Can't see the diff marks anymore

I got a conflict on a file and I tried to resolve it using one of my favorit editor (vim or sublime text) but when I opened the file I can't see the diff marks in the file anymore (<<<<<<< HEAD, =======, >>>>>>>). I'm still able to use vim as git…
svassr
  • 5,538
  • 5
  • 44
  • 63
0
votes
2 answers

How SVN revert affects other collaborators in the project?

There are multiple collaborators to a project stored in SVN. The current repository revision is 10. I've just found out that I need to revert to revision 5 and start working from there. Then I make changes and make a new commit (revision 11). How…
sandalone
  • 41,141
  • 63
  • 222
  • 338
0
votes
1 answer

Will prettify cause conflicts in my git merges?

I've been introduced to a PHP / HTML codebase that is not consistently indented. I would like to run a "pretty code" or "prettify" on the code, but I am concerned that this will cause conflicts on some merges. Any advice for accomplishing this or…
Betsy Dupuis
  • 513
  • 1
  • 6
  • 21
0
votes
0 answers

Keeping Django databases in sync in real time with intermittent connections

Currently I am working on a data gathering project in which we are using deployed data gathering devices as well as a centralized server that will store all aggregated data from multiple deployed devices. Both the deployed data gathering devices and…
jhilliar
  • 226
  • 2
  • 8
0
votes
1 answer

Preventing the accidentally marking of all conflicts as resolved in Mercurial

It doesn't happen too often, but every once in a while I'll fumble with my typing and accidentally invoke "hg resolve -m" without a file argument. This then helpfully marks all the conflicts resolved. Is there any way to prevent it from resolving…
user1063042
  • 273
  • 2
  • 11
0
votes
1 answer

Removing directory from the entire history in git

I'm working with a legacy project that included in the repository a directory that should have been ignored. The contents of this directory is causing a huge number of irrelevant conflicts while rebasing. Is there a way to completely remove this…
cfischer
  • 24,452
  • 37
  • 131
  • 214
0
votes
1 answer

Files pull from GitHub contain HEAD >>>>>>>>?

I update all my files on my server via GitHub. But yesterday I did a "git pull" but the files that were downloaded were corrupted so when I checked the website they were weird things appearing. It was written HEAD >>>>>>>>>> I don't remember the…
jnbdz
  • 4,863
  • 9
  • 51
  • 93
0
votes
1 answer

Why does Git sometimes generate meaningless merge conflicts

Quite frequently during rebases, Git generates a merge conflict like the following: <<<<<<< HEAD } ======= } >>>>>>> f192b7c... My commit description here The two sections are, character-for-character, identical. Is this a known bug? Using version…
Steve Bennett
  • 114,604
  • 39
  • 168
  • 219
0
votes
2 answers

Git uncommit message only

I'm in this scenario pretty often and I don't know what to do. I was changed something in a branch. Commited & pushed. I was still working on same branch and somebody commited & pushed. I was done changing and did git commit -m "Blabla" and…
ewooycom
  • 2,651
  • 5
  • 30
  • 52
0
votes
1 answer

git ahead by X commits...can't find solution

Here's the sequence I have no edits on the branch at this point I did a git pull --rebase in a branch that is tracked to a remote branch Conflicts occured I did git reset --hard then git rebase --abort And now it says that my branch is ahead by X…
pillarOfLight
  • 8,592
  • 15
  • 60
  • 90
0
votes
1 answer

git svn: Avoid large-scale conflicts in branching, merging, and rebasing

I work on two machines (Mac and Windows) with git-svn. My remote repo is an svn. I use the Mac as master repo, and the Windows as a slave. So all git-svn operations are done on the Mac, and the Windows machine only "git pull" or "git push" with the…
kakyo
  • 10,460
  • 14
  • 76
  • 140
1 2 3
…
50 51