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
-1
votes
1 answer

How to find Conflicts in merge request before create

How to find git conflicts Before creating merge request? I want to find conflicts before create merge request and push that. if I test merge and not conflict exit branches merged and I don't want that.
AAV
  • 798
  • 1
  • 6
  • 23
-1
votes
1 answer

Ignoring specific line(s) from merge conflict evaluation?

In my project there's someFile, whose the very first two lines look like this: // This file is automatically generated // Generated on 25.08.2020 15:01:00 The time in the second line varies. This second line is therefore an unnecessary source of…
weno
  • 804
  • 8
  • 17
-1
votes
1 answer

Git raising conflicts for simple merges

I'm having issues with a BitBucket repository whereby, upon performing merges from one branch to another (this can be any branch, it happens regularly) it raises conflicts for very simple changes. For example, the only difference between two…
B-Lat
  • 1,685
  • 1
  • 18
  • 25
-1
votes
1 answer

Decline Jenkins Job if PR has Merge Conflict

I want to decline Jenkins Job for PR if a merge conflict is present. How do I go about it?
Mithiridi Prasanth
  • 378
  • 3
  • 13
-1
votes
2 answers

I have a conflict merge problem with bitbucket

I try to pull a commit into the main branch with Bitbucket but i had a conflict problem with my code and the merge branch. like with the import for example import org.slf4j.LoggerFactory; import…
Dumas Théo
  • 5
  • 2
-1
votes
2 answers

Merge branches, unmerged since long time

I am facing this issue because of my own negligence. Scenario: I have two branches master and branch1. From start they don't have any .gitignore file (that is my big fault). Now the status of branch1 is This branch is 12 commits ahead, 4 commits…
Junaid
  • 2,572
  • 6
  • 41
  • 77
-1
votes
1 answer

sourcetree - how to quickly resolve multiple merge conflicts and use master code?

I need to merge my master branch with my development branch but there are soooo many conflicts as I have been working on the master and not updating the development branch. Is there a quick way to resolve these? I simply want my development branch…
LeeTee
  • 6,401
  • 16
  • 79
  • 139
-1
votes
1 answer

GIT - Problems when merging files

I am trying to merge two branches from two features of my project(master into branch XXX). But instead of throwing merge conflicts, git is removing some content(and even some files) because they don't exists in master. Is that correct? I wasn't…
G. Alves
  • 33
  • 4
-1
votes
1 answer

Subversion merge loops over the same revision

Using Subversion plugin in Eclipse Juno, am trying to merge 80+ revisions from branch B to A. The point is that, some revisions were already merged manually. But there is no reference tells which revisions were merged manually, so, I decided to…
bola shokry
  • 29
  • 4
-1
votes
2 answers

How to revert changes due to a merge with Eclipse and EGit

I am using Eclipse Mars.1 (4.5.1) with EGit 4.1.0. After a merge from a branch into master, I cannot figure out how to tell EGit to resolve a conflict by simply keeping the version that was in master before the merge, ignoring anything that came…
SantiBailors
  • 1,596
  • 3
  • 21
  • 44
-1
votes
1 answer

GIT error while merging two branches

I have just started working on github, so I am sorry in advance if my question seems foolish to you. I was learning git hub and here was the problem that I am tackling. I have two branches, say master and second-branch I have had a readme.txt file…
FAISAL
  • 459
  • 8
  • 22
-2
votes
1 answer

How can I programmatically resolve merge conflicts?

I have a branch mybranch with all sorts of changes and need to rebase it on master. The difference between the current and the target base of mybranch is one commit replace that consists entirely of replacing (most but not all) occurrences of foo…
peer
  • 4,171
  • 8
  • 42
  • 73
-2
votes
2 answers

How to reduce merge conflicts in github?

In github, I used to code in other branches and then merge it to main branch. When merging branch it every time returns merge conflicts. It is frustrated to solve those conflicts. How to reduce this?
Balaji
  • 7
  • 4
-2
votes
2 answers

How can you migrate your way of working from CVS to Git?

We are in the progress of migrating our old CVS server towards git but I am getting some pushback from one of the main developers that has been working with CVS for the last 30 years. I think he has some difficulties coming to grips with git. He…
Vincent Smit
  • 1
-2
votes
2 answers

GUI for manual merging 2 branches on GIT

I have 2 branches on a project, both with plenty of changes since branching. Now I need to merge changes from one to other (and possibly into new branch, but it doesn't really matter - whatever is easier). I would like to do the merge manually in…
Juraj.Lorinc
  • 503
  • 6
  • 26
1 2 3
…
50
51