0

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 the conflict file that I committed.
Why?

VonC
  • 1,262,500
  • 529
  • 4,410
  • 5,250
Faizan Ahmed
  • 184
  • 3
  • 12
  • What are the conflicts? Maybe there are none. What is the "conflict resolver"? Which commands did you run? Can you share the repository? – knittl Jul 29 '21 at 06:17

2 Answers2

3

Try this sequence:

git switch abc
# work and commit
git switch master
git pull
git switch abc
git rebase master

If there are any files which have changed both on origin/master and on local abc branch, the git rebase command will ask you for merge conflict resolution.
But if the modified files in abc were not modified in origin/master, the rebase would complete automatically.

VonC
  • 1,262,500
  • 529
  • 4,410
  • 5,250
-1

Hi conflict arises when a file present in two branches with modified content, In your case , consider a file sample.txt is present in master and abc and content of the file is not same and if you try to merge. The conflicts can be merged in github web or using git bash

RajM
  • 21
  • 5