Stack Overflow
Stack Overflow

Questions tagged [git-merge-conflict]

Questions about resolving merge conflicts in Git.

See also

518 questions
0
votes
1 answer

git rebase interractive before merge with conflict

I am trying to modify commits from before a merge where I had to solve conflicts (especially, I want to squash a new commit into one before the merge, but just rewriting commit messages lead to the same issue). When I use: git rebase -i…
Puck
  • 2,080
  • 4
  • 19
  • 30
0
votes
2 answers

Several feature branches in the Github Flow

I have a question regarding the GitHub flow and specifically about how to manage multiple features developed at the same time. Let assume we have a simple CSS file. .container{ height: 500px; width: 500px; background-color: blue; …
MattL
  • 109
  • 3
  • 12
0
votes
2 answers

Git conflict not showing my committed changes

I have two branches (master and abc) I have added some code in abc and committed the abc. I pulled origin/master and now my abc is behind a few commits. When I rebase or merge abc with master, in conflict resolver; it does not show the changes in…
Faizan Ahmed
  • 184
  • 3
  • 12
0
votes
1 answer

Error while resolving conflicts after latest pull from master branch

I pulled latest remote master branch into my private branch but the automatic merge failed and there were conflicts I tried resolving them by accepting the changes from master branch with the command git checkout --theirs but it is…
Abhist
  • 43
  • 1
  • 6
0
votes
0 answers

git mergetool is displaying lots of unrelated changes in cherry-pick

Imagine I have a master repository and some forked repositories. In a forked repo, some changes have been made quite a while ago. There is one commit in particular that I want to cherry-pick onto master. Imagine the original file (that the repo…
itecMemory
  • 301
  • 2
  • 8
0
votes
1 answer

How to preserve adjusted merge commits (conflicting and non-conflicting automerge results) with git rebase?

I'm using git rebase -i --rebase-merges to change some commit messages, which works fine. But the merge commits I'd like to preserve had changes or conflict solutions; is there an easy way to redo them? My current work around is the…
chkpnt
  • 125
  • 10
0
votes
0 answers

Avoid Git conflict

Let's admit I want to work on a doc document with 2 parts, and I want to work on these 2 parts with 2 different branches part1 and part2, created from master. When I merge part1 into master, nothing wrong but then, when I merge part2 into master, I…
kalyklos
  • 53
  • 1
  • 6
0
votes
1 answer

Intellij apply conflicting merges

The below screenshot is from a rebase of one branch on top of another. There are a lot of conflicts like in the picture. They conflict, but if they were applied first one, then the other, they would apply cleanly. Is there a way to tell IntelliJ…
drdeath
  • 81
  • 1
  • 11
0
votes
1 answer

Automerge after patch apply with conflics

I have several repositories with "just the same" package.json and several config files. I have changes made in one repository and want to spread this changes on others. I managed to do just the right thing following these instructions: git…
arsonist
  • 175
  • 1
  • 11
0
votes
0 answers

I merged two branches but reverted that merge again. I tried to merge again but it says already up to date, however the files are totally different

Merged one branch into my branch, but I reverted that merge. I merged again by git checkout branch1 git merge branch2 but it says already up to date, however, I don't see any changes in my branch. It is still not merged and didn't have those merge…
Spike
  • 23
  • 4
0
votes
0 answers

After git pull, some files are marked as changed in local which are actually behind server

The problem occurs in different people of this repo, the symptom is when someone git pull, there will be a lot of changes in pending changes, which are not really his change. These files actually are changed by others and checked in, but somehow git…
Jarvan
  • 1,135
  • 8
  • 22
0
votes
1 answer

How to resolve git conflicts after taking pull request in Visual Studio?

I am using Visual Studio and recently I have taken pull request from master and now it's saying me "There are unresolved conflicts in your directory" error while committing my changes. Can someone please help me to resolve git conflicts after taking…
Jyoti Dhagude
  • 9
  • 1
0
votes
1 answer

Recalculate merge conflicts (ie. how to generate conflict markers)

I have a merge conflict where most conflicts are due to code formatting. My code has the <<< === >>> markers inserted by git, to help me resolve the conflicts. While in this state, I want to reformat the code corresponding to the commit to be…
PizzaBeer
  • 183
  • 14
0
votes
1 answer

Merge conflict with Visual Studio

Currently my team is working on same .json file, one colleague is inserting a code just on the same line which I also inserted the code (e.g.) My Colleague added: line30: "it": "Nuovo Progetto" I added: line30: "es": "Nuevo Proyecto" Visual Studio…
Felipe López
  • 51
  • 2
0
votes
3 answers

git rebase squash commits

I have my own dev branch checkout from master, and there is another dev2 branch owned by another guy and still in DEVELOPING. I need use the changes on dev2, so I use git merge dev2 on my dev branch. On next day, the guy developing on dev2 wrote…
VGBird
  • 61
  • 5
1 2 3
…
34 35