Stack Overflow
Stack Overflow

Questions tagged [git-merge-conflict]

Questions about resolving merge conflicts in Git.

See also

518 questions
0
votes
1 answer

Commit merge conflict

I want to push files to git even when there is a merge conflict (in this case I want to push the conflict). I don´t find the way. Git doesn't allow me to commit due to the conflict, but I want to push this conflict. How can I do it?
David Marciel
  • 865
  • 1
  • 12
  • 29
0
votes
1 answer

Resolving merge conflict merged in both source and target branch

I have two branches: Branch 'dev' Branch 'prod' 'dev' is where all features are consolidated, 'prod' is the production branch. Before new releases, 'dev' is merged to 'prod' and a release build is made from it. The 'prod' branch has certain things…
SayantanRC
  • 799
  • 7
  • 23
0
votes
0 answers

How can I manage .xpbproj conlicts

I have to make some UITests for an iOS app and this is how it goes: I use XCode ide and xctest library. I write my tests, they pass and everyone is happy. When a new version of the app gets released, I have to install it manualy and run my…
Baguette
  • 1
0
votes
1 answer

How can I use a dev dependency locally on my machine only and not have to push it to the team repo?

I'm part of a time working with a remote repo. I recently installed a great Webpack plugin that plays a sound when Webpack finishes building the project. I love it but my team lead does not want it becoming part of the repo. The problem is that…
CodyBugstein
  • 21,984
  • 61
  • 207
  • 363
0
votes
1 answer

How to do a BitBucket Pull Request Conflict Resolution in IntelliJ IDEA

So, lets say I have development branch, and opened a PR for my feature branch into development. I have a conflict in say, 1 file (or 10, whatever) - bitbucket says what I need to do: git checkout development git pull origin feature ...Do merge…
Carmageddon
  • 2,627
  • 4
  • 36
  • 56
0
votes
1 answer

git merge multiple commits into one in an orphan branch each commit in a prefix subdirectory

I need a merge more than 1 commit each from a branch or a remote repo into a single commit in another branch. input branch#1: o--o- - -o (C1) \ input branch#2: o--o- - -o | (C2) : \| input…
Andry
  • 2,273
  • 29
  • 28
0
votes
2 answers

azure-devops Merge Issue for Test Branch

we have azure devops repo setup with Master > TEST > Development for last sprint we merged changes from Development to TEST and had merge conflicts one of the developer created local TEST branch and Merged Development changes to resolve changes…
Dyaneshwaran S
  • 69
  • 1
  • 7
0
votes
2 answers

Git merging more commit than it should

I'm rather unfamiliar with git (mostly using classic commands like checkout, push, pull) Here is my gitflow, I've got 2 branch Master and Develop. I'm working on Develop and then creating merge request from Develop to Master. I've done it last week…
Biscuit
  • 4,840
  • 4
  • 26
  • 54
0
votes
1 answer

How can i have two unrelated branches in GIT have a common root?

I have recently migrated my SVN repo to GIT. The SVN repository had 2 branches with same commit history. Now in GIT , I would like to have these 2 branches with parallel graph have a common root. How can I do it? Rebasing one branch over other…
dgupta3091
  • 1,067
  • 1
  • 7
  • 18
0
votes
0 answers

When merging binary files with Git, is there a way to have Difftool ask whether to just merge one of the files?

The Situation The primary files our team works with are binary files from Git's perspective. When merging, if the two branches have the same file with any differences, there will always be a merge conflict. Every time. Which basically means we will…
LightCC
  • 9,804
  • 5
  • 52
  • 92
0
votes
2 answers

can git conflict create additional files like svn does

I'm asking about svn feature which I want to know whether it exists for git or not: When svn has conflicts, it creates some additional files which are sometimes useful: See…
Eliyahu Machluf
  • 1,251
  • 8
  • 17
0
votes
1 answer

Merge conflicts stick together after merging

When git-merging two branches which produces two merge conflicts located in non-coherent lines I wonder why the output produced by auto-merge only shows one conflict containing multiple equivalent lines. The following shows the output after…
Lukas
  • 314
  • 3
  • 14
0
votes
2 answers

View the history of a file while trying to merge, showing both branches

I am trying to handle merge conflicts. Rather than seeing the changes on each branch, as tools typically show, what I really want to see is the tree of the file, starting from the nearest common ancestor, then showing the commits that changed the…
William Jockusch
  • 26,513
  • 49
  • 182
  • 323
0
votes
1 answer

Reverted all my commits on branch still getting conflicts on rebase

I was working on a feature branch so long because of sick leave that the origin/develop branch is way out of sync with my feature branch. Since I had a small amount of changed rows but in many classes, I decided to just revert all my changes in that…
Steve Waters
  • 3,348
  • 9
  • 54
  • 94
0
votes
1 answer

What is the behavior of git during rebase conflicts when choosing one but needing both?

I'm trying to understand git rebase, but I'm having issues. I've read a number of forum posts and documentation to see if I can pin this down but the behavior seems odd to me so I can't wrap my head around it. Let's say I have a file, called…
Frank
  • 915
  • 1
  • 7
  • 22
1 2 3
…
34 35