Closed khandelwaltanuj closed 1 week ago
Hello,
I performed following steps Step 1: From your project repository, check out a new branch and test the changes.
git checkout -b khandelwaltanuj-main main git pull git@github.com:khandelwaltanuj/cv-hpdcache-verif.git main Step 2: Merge the changes and update on GitHub.
git checkout main git merge --no-ff khandelwaltanuj-main git push origin main
bit I still cannot merge
Thanks and regards Tanuj Khandelwal
but I still cannot merge
Yeah, and I notice that the automatic conflict resolution tool on GitHub has also given up. :stuck_out_tongue_closed_eyes:
At this point I declare defeat. Your best strategy is to close this PR and start a new one. A couple of suggestions:
khandelwaltanuj:my-feature-branch
to openhwgroup:main
.OK @MikeOpenHWGroup
Thanks for this one.
Regards Tanuj
Thanks Tanuj