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

Merge conflict query in bitbukcet

I have three branch Master, Test1, Test2 (Test 1 and Test 2 created from Master) Now in Test1 branch, I have made some changes to a single file (like updating the method code and signature ) and then created a pull request to merge the same with…
yogini kothekar
  • 31
  • 1
  • 2
0
votes
3 answers

How to extend work on a branch in Git

I've created branch A which is going through an extended review prior to merging into master. While that review commences, I need to create branch B which builds on the work in Branch A (which is frozen at this point). This looks like the…
David Parks
  • 30,789
  • 47
  • 185
  • 328
0
votes
1 answer

How to remove git addons on my page after resolving merge issues?

Recently I had a merge conflict in git. After using some git commands I managed to resolve those conflicts, so my git gives a message that all is ok and up-to-date with branches and with production master. So I was happy that I resolved all…
gileneusz
  • 1,435
  • 8
  • 30
  • 51
0
votes
1 answer

PyCharm: conflicting file is displaying as a normal file

The problem is that after some commits into different branches, I've got a merging conflict. I decided to resolve it via PyCharm, but VCS->Git->Resolve Conflicts is disabled. After, I looked into Local changes and the file with conflicts is blue…
smart
  • 1,975
  • 5
  • 26
  • 46
0
votes
0 answers

Remove merge commit and revert merge completely from branch

I have recently started working on git. Here is the issue, it might be a bit confusing but I will try my best to describe my issue: We are a group of developers , a master branch was created. We all created custom branches from it for the feature we…
Yash Khare
  • 355
  • 2
  • 10
0
votes
2 answers

Git rebase conflict: many files deleted locally, and modified on remote. How to `git rm` all of them?

I'm on branch feature and rebasing onto master and histories have diverged. In feature dozens of files have been deleted that have at the same time been modified on master. I'm sure I don't need these files anymore, so rebase, keeping what's on…
Dmitry Avtonomov
  • 8,747
  • 4
  • 32
  • 45
0
votes
2 answers

How can I copy many files, defined by extension, in many folders, from one remote repository branch to another?

It seems, I have changed not only my backend files on the remote branch, but also many frontend files. Now they are changed in my branch and I can't merge it to the master branch. How can I copy files chosen by extension from one branch into…
Gangnus
  • 24,044
  • 16
  • 90
  • 149
0
votes
0 answers

Resolving Git Merge Conflict

Working in git with limited 8-10 years experience using CVS needing to understand what git repo is doing. I created a branch off master with changes that I committed and then pushed back to master. Now in the same project I created another branch…
April_Nara
  • 1,024
  • 2
  • 15
  • 39
0
votes
1 answer

Undo a previously resolved merge conflict resolution?

Say I have a feature branch and was rebasing from a devlopment branch and ran into a merge conflict. Instead of including both the content from the development branch and the content from my feature branch during conflict resolution, I mistakenly…
koalamo
  • 199
  • 3
  • 11
0
votes
1 answer

Show summary of conflicting diff part of merges in git log

I am looking for a way to show only the conflicting part of merge commits in a git log, preferably along with all the other (non-merge) diffs from a history I get with git log --numstat. There is a question similar to mine that was already…
Lorenz Walthert
  • 4,414
  • 1
  • 18
  • 24
0
votes
1 answer

Steps to resolve Git merge conflict

Merge conflict after these steps: Feature branch created from develop branch. Commit A created on feature branch. Few commits merged to develop branch from other feature branches. Develop branch merged to feature branch - creating a merge…
Shashi
  • 129
  • 1
  • 2
  • 9
0
votes
1 answer

Resolving Git merge conflicts with inconsistent local code

I am having some confusion with resolving merge conflicts. It seems that my local code reflects changes I made and in other places changes that my colleague(s) have made- all before I've actually merged. The very small image below simply…
8protons
  • 3,591
  • 5
  • 32
  • 67
0
votes
2 answers

How to investigate why Git deleted some code

We just had a problem with an automatic merge commit where some lines have been deleted that should not have been deleted. We then fixed it manually, but it just happened again. We currently have a more SVN-like Git workflow: There is only one…
causa prima
  • 1,502
  • 1
  • 14
  • 24
0
votes
1 answer

All Inclusive file version merge

Typical merge and source control tools mistake added code for code change especially if you merge several branches/version. Is there solution to merge several versions /branches of code without deleting a symbol? So the result of merge is…
Serge
  • 3,387
  • 3
  • 16
  • 34
0
votes
0 answers

Logic of conflict resolution

I have simple test repository - just 1 file and several commits (creation of the repository is described at the end). I'm trying two variants of cherry-pick operations and I don't understand logic of conflict resolution: If I do: git cherry-pick…
avk700
  • 11
  • 2
1 2 3
…
50 51