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 stash apply conflict after rebasing and amending a commit

I stashed my changes to rebase and amend a commit. After rebasing, I deleted a file, staged it and the ran commit --amend Unfortunately the file in question had been modified when I stashed the work. Now after rebase --continue I can't stash apply…
MTVS
  • 2,046
  • 5
  • 26
  • 37
0
votes
1 answer

What happens if I pull a change on a file earlier set assume-unchanged in Git?

I'm curious if I run git update-index --assume-unchanged, and somebody chages that file in a way that produces a conflict, what happens, if I pull those changes? Do I get a simple conflict? Does it overwrite my changes, since it assumes the file is…
Tamás Barta
  • 1,617
  • 1
  • 19
  • 23
0
votes
2 answers

is there a check in git to avoid working on the same piece of code and avoid a later conflict

When a merge conflict happens there is an unplanned change of code to resolve the issue. Can I check if another person is working on the same section of code as I am and co-operate before the conflict occurs?
rustystylus
  • 1
  • 2
-1
votes
1 answer

While taking pull from VS code.This conflict message pops up

$ git pull --tags origin development * branch development -> FETCH_HEAD error: Your local changes to the following files would be overwritten by merge: Please commit your changes or stash them before you merge. Aborting. I just need to…
Agnum
  • 199
  • 1
  • 1
  • 8
-1
votes
2 answers

How to pull from my distant repository and force conflict?

I have a large file on GitHub and the last commit from me is a simple modification of one line. Other people are working on this file. I would like, when I pull everything on my laptop (having the original repository), to obtain a conflict to solve…
Hedwin
  • 31
  • 1
  • 6
-1
votes
1 answer

Git Merge Dropping File Lines

I have a feature branch called feature/a off of develop that was created a while ago. I have since merged feature/b and feature/c to develop. All of these branches have a common main file that they alter. I am now wanting to merge the develop branch…
user19840507
  • 1
  • 1
-1
votes
1 answer

Why I have conflicts only if I pull from other git branch?

I'm learning Git and I don't understand why if I do git pull from the same branch I don't have conflicts, but if I do git pull origin other-branch I have conflicts. For example: case1: I have branch1 with a txt file and I have character "12", then I…
elvis
  • 956
  • 9
  • 33
  • 56
-1
votes
1 answer

Are two branches necessarily identical if both rebase and merge are mutually "up-to-date"?

When two branches are reported by git as mutually "up-to-date" for both rebase and merge, does this entail that their content must be identical? Also, I'm thinking the reverse is maybe not entailed, since branches with identical content could have…
Glenn Slayden
  • 17,543
  • 3
  • 114
  • 108
-1
votes
1 answer

Git Branch and Fork Questions - Conflicts

Trying to figure out what happens in particular cases when there are multiple branches and/or a fork off of a master branch and how that might cause conflicts. Say I have the following case where black is the master branch, red is a branch, and…
Windstorm1981
  • 2,564
  • 7
  • 29
  • 57
-1
votes
1 answer

How do I solve "error: Merging is not possible because you have unmerged files."?

When I enter git merge "my-most-up-to-date-branch" I get the following error: Problem is that I don't know where to start, at all. There are differences in .py files which I can edit by hand. But, also ones that can't fixed by hand like .db , .pyc…
Kutay Eroglu
  • 73
  • 1
  • 5
-1
votes
1 answer

Why changes in another line arise git merge conflict?

I modified different lines in different branches, but those changes occur git merge conflict. I read the post, but I think the changes occur in totally different lines. Here are my test codes. branch-base Hello, my first conflict. Second line.a #…
heeam shin
  • 3
  • 3
-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

How to report files with conflicts after merge

I use Git for revision control. I performed the 'git pull' command, some files were successfully merged, but some files ended with the conflicts. So, how to report files with conflicts after merge in Git?
ldm_as
  • 1
-1
votes
1 answer

Git forking a recipe for unrecoverable disaster?

Using GIT seems to be like playing a new form of chess where nobody really knows the rules. Here is what I did, please let me know why this went wrong so quickly. I have a main fork/repo and my personal fork. git clone…
user11472602
-1
votes
1 answer

How to solve github conflicts?

I am taken course in udacity (not nanodegree) . It discuss git and github . In discussing pull and push , I asked my self what if a conflict happens . Several developers commits the files of course a conflict will happen .. i didn't find an answer…
Ahmed A. Talawy
  • 27
  • 3
1 2 3
…
34
35