GIT THis is the first commit from main branch
feature-1 developer is doing some development developer spends some time and pushes to git lot of time as part of development rebase rebase is another merge strategy developing still now development is completed
###squash started development adding more code
still adding more
now it is completed
###this is from developer-1 conflict branch. I want to keep this line of code
this is developer-1 conflict code end. iam developer-2 adding some new features.
=======
iam developer-2 adding some new features.