Rohit Bajaj

<div>
<div class="content wysiwyg-content">
Hi,<br />
I am doing git rebase on a branch. There was some conflicts i resolved it and did git add<br />
and then performed git rebase --continue<br />
but got the same conflict again.<br />
I tried this 2 times and still on the same conflict.<br />
<br />
How to resolve this and what could be the reason for this ?<br />
Here is the screenshot of the terminal : <br />
<a href="https://filedb.experts-exchange.com/incoming/2019/01_w02/1409379/Screen-Shot-2019-01-12-at-5.13.07-PM.png" target="_blank" title="Screen-Shot-2019-01-12-at-5.13.07-PM.png (246 KB)"><img alt="Screen-Shot-2019-01-12-at-5.13.07-PM.png" class="file-block lazyload" style="max-width: 800px;" data-src="https://filedb.experts-exchange.com/incoming/2019/01_w02/800_1409379/Screen-Shot-2019-01-12-at-5.13.07-PM.png" /></a>Thanks
</div>
</div>


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

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

Understanding the functioning of git rebase

Git is a version control system for software development. It is a distributed revision control system with an emphasis on speed, data integrity, and support for distributed, non-linear workflows. Git was initially designed and developed for Linux kernel development. As with most other distributed version control systems, every Git working directory is a full-fledged repository with complete history and full version-tracking capabilities, independent of network access or a central server.