troubleshooting Question

Understanding the functioning of git rebase

Avatar of Rohit Bajaj
Rohit BajajFlag for India asked on
Git
1 Comment1 Solution111 ViewsLast Modified:
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.pngThanks
ASKER CERTIFIED SOLUTION
David Favor
Fractional CTO
Join our community to see this answer!
Unlock 1 Answer and 1 Comment.
Start Free Trial
Learn from the best

Network and collaborate with thousands of CTOs, CISOs, and IT Pros rooting for you and your success.

Andrew Hancock - VMware vExpert
See if this solution works for you by signing up for a 7 day free trial.
Unlock 1 Answer and 1 Comment.
Try for 7 days

”The time we save is the biggest benefit of E-E to our team. What could take multiple guys 2 hours or more each to find is accessed in around 15 minutes on Experts Exchange.

-Mike Kapnisakis, Warner Bros