@gracebish can drop the pull request here to
@gracebish this means that some work has been merged so you need to update your branch with local changes git --rebase origin/master. However if you still blocked , this can help you resolving merge conflicts
Thanks @sharif. I tried to do all that but failed.
Thanks. This is the link to the pull request. https://github.com/openmrs/openmrs-core/pull/3238
Kindly remove the whitespaces on your PR or else you are bound to get the git conflict.
the conflicts are coming from
you can look into these classes and see which new changes in HEAD were merged and include them locally
hello @gracebish, where you able to resolve the conflicts ?
I am trying my best
Thanks @gcliff. I am done now trying to squash my commits.
@gracebish you may ignore the squashing of the commits as per resolution here RFC: Favour not squashing commits over squashing commits
Thanks very much for the support. i keep following
@gcliff, I was caught up in the middle of squashing commits when you sent the message. I have tried to read about undoing the final squashed commits without affecting the history but still stranded. Kindly advise
There are some comments by @teleivo on this PR https://github.com/openmrs/openmrs-core/pull/3238#issuecomment-653728578 on how to sort out the issue. Just try out the steps closely and share the output.