Git
Git

Understanding the functioning of git rebase

Hi,
I am doing git rebase on a branch. There was some conflicts i resolved it and did git add
and then performed git rebase --continue
but got the same conflict again.
I tried this 2 times and still on the same conflict.

How to resolve this and what could be the reason for this ?
Here is the screenshot of the terminal :

Screen-Shot-2019-01-12-at-5.13.07-PM.png

Thanks

Rohit BajajAsked: 2019-01-12

Who is Participating?

Experts Exchange Solution brought to you by

Enjoy your complimentary solution view.

Get this solution by purchasing an Individual license! Start your 7-day free trial.

I wear a lot of hats...

"The solutions and answers provided on Experts Exchange have been extremely helpful to me over the last few years. I wear a lot of hats - Developer, Database Administrator, Help Desk, etc., so I know a lot of things but not a lot about one thing. Experts Exchange gives me answers from people who do know a lot about one thing, in a easy to use platform." -Todd S.

LVL 38

David FavorLinux/LXD/WordPress/Hosting SavantCommented: 2019-01-12

Fixing this type of problem can be complex.

Since you have a 3-way merge that fails, this means 2x people have changed pom.xml so there's a repository copy + 2x changed copies.

If one of the 2x people who've changed pom.xml is you, this is fairly easy to resolve, by doing this...

cd top-of-tree
mv service/pom.xml ~/.
git checkout -- service/pom.xml
mv ~/pom.xml service/pom.xml
git commit service/pom.xml
get rebase --continue

Open in new window

By removing your version of pom.xml out of the tree + starting with the repository copy, you should only have a 2-way merge to resolve.

If other people have created the changes to pom.xml then you'll likely have to go through this process with one of them, to break the 3-way merge conflict.

Experts Exchange Solution brought to you by

Your issues matter to us.

Facing a tech roadblock? Get the help and guidance you need from experienced professionals who care. Ask your question anytime, anywhere, with no hassle.

Start your 7-day free trial