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 :
Thanks
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 :
Thanks
Do more with
EXPERT OFFICE® is a registered trademark of EXPERTS EXCHANGE®
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...
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.
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
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.
Premium Content
You need an Expert Office subscription to comment.Start Free Trial