Stack Overflow
Stack Overflow

Questions tagged [git-merge-conflict]

Questions about resolving merge conflicts in Git.

See also

518 questions
0
votes
1 answer

How can a git pull on a branch with no changes result in conflicts?

So the scenario is quite basic: I did a checkout of a git repo, on branch X. Made some changes, performed a commit and pushed them, all good so far. No other changes made for 2-3 days. Afterwards I came back, ran a git status to make sure I have no…
Biggie Mac
  • 1,307
  • 2
  • 13
  • 26
0
votes
0 answers

incrementally rebase onto latest master

Let's say over past 8 hours, 2 PRs have merged to master. They are of medium size, not so huge, but not so small. I'd like to incrementally rebase onto latest master. i.e., I'd like to rebase onto master as of the first PR merging, resolve…
Devin Rhode
  • 23,026
  • 8
  • 58
  • 72
0
votes
0 answers

Problem with merging feature branch on develop branch

I have questions about git merging. I'm a student, and currently working on a project with four colleagues. So, I tried to merge my feature branch on develop branch, and got some conflicts that i didn't know how to solve. Because i didn't have time…
Moonlight
  • 1
  • 1
0
votes
0 answers

Copado User Story showing Potential Conflict with Old User Story Which is Already Deployed

My team is trying to deploy changes (flow metadata) from DEV to UAT and it is showing "Potential Conflict" with another user story which is already being deployed into Production almost 5 months back and also back-promoted. My understanding is that…
Sudipta Deb
  • 465
  • 1
  • 4
  • 10
0
votes
1 answer

How does Github (not Git) solve merge conflicts when pushing to remote repository?

I have completed two Github tutorials but this topic was not covered in any of them. My confusion is, when 5 developers are working on the same branch, they all start working at 10 in the morning, they all pull the repo from remote to their local…
Yogie
  • 986
  • 2
  • 12
  • 14
0
votes
2 answers

How to solve git conflict with master that has too many commits ahead?

How can I solve conflicts with master in GitHub without bringing all ahead commits of master? Scenario: I've created a branch A from master, which is a protected branch While I was working on the branch A, the master branch received many commits…
mateusvl
  • 131
  • 12
0
votes
1 answer

How to resolve a merge conflict

I got a merge conflict in multiple files when I tried a pull request in a github repo. While I know how to resolve merge conflicts in a normal case, my situation seems more convoluted. Master branch: The Master to which I am merging has no…
Photonslave
  • 9
  • 1
0
votes
1 answer

How to tell git that file has conflict when it didn't change?

There are two files A and B. One is edited in branch b1. Both were edited in branch b2. When merging b1 to b2, I am resolving the conflict by deciding that version of file A from branch b1 is correct. However, after the merge, file B doesn't match…
Piotr Kubiak
  • 68
  • 6
0
votes
0 answers

Need to onboard content to GitHub with branches that have disjoint history

I am trying to onboard some code to GitHub Enterprise and am experiencing a lot of difficulty. I am attempting to build a pipeline of sorts using VMware vRO 8.x in a brownfield scenario. These four instances are meant to be the basis of the code…
aenagy
  • 37
  • 6
0
votes
2 answers

Git rebase appears to use an old version of a file, causing conflicts

I am using GitHub Desktop on a Mac with Beanstalk as my remote git repository server. I have a project with Main, Dev, and Dev-phpunit-baseline branches. Main is production-ready, Dev is branched from Main, and Dev-phpunit-baseline is branched from…
JohnG
  • 429
  • 1
  • 4
  • 14
0
votes
1 answer

Azure Devops pull-request conflict on complete

Probably this is for a lot of users, a simple question, but I can't figure it out right now. Situation, in Azure Devops Git repositories we have multiple branches: master (main development) Acceptation (Acceptation branche) Production (Production…
Michiel van Vaardegem
  • 2,260
  • 20
  • 35
0
votes
0 answers

What exactly does "Shelve base revisions of files under distributed version control systems" do in IntelliJ?

This is the official description of the docs If this option is enabled, the base revision of files will be saved to a shelf that will be used during a 3-way merge if applying a shelf leads to conflicts. If it is disabled, IntelliJ IDEA will look…
Marian Klühspies
  • 15,824
  • 16
  • 93
  • 136
0
votes
0 answers

git lfs migration or create a new git repo

Problem: Frequently modified build artifact has been in the code base for over a year, causing the git repo to balloon exponentially. git lfs migrate and git filter repo, appears to do similar things, rewrite the commit history. Since the Blob is…
shell_surfer
  • 23
  • 1
  • 1
  • 4
0
votes
0 answers

Github - Resolve Conflcits UI shows conflict but there isn't

Github UI shows conflict even though when I merge main into feature-branch locally there is no conflict. <<<<<<< feature-branch print('Hello') ======= >>>>>>> main I solve the issue by manually merging feature-branch into main and then pushing to…
m0lly
  • 1
  • 1
0
votes
1 answer

How can I merge two protected branches in git when they are not in sync?

I have a GitLab repository for my application. Following some guidelines (https://nvie.com/posts/a-successful-git-branching-model/) I created a "main" branch that mirrors the production version and a "develop" branch that mirrors the version…
Geepy
  • 62
  • 1
  • 7
1 2 3
…
34 35