Trying to resolve merge conflict on TRUNK-5115

1

I have tried to pull master and compared a couple of files and i can see that they are different on my local machine from what is on github. Please help @dkayiwa, @ibacher, @teleivo

2

@gracebish can drop the pull request here to

3

@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

4

Thanks @sharif. I tried to do all that but failed.

5

Thanks. This is the link to the pull request. https://github.com/openmrs/openmrs-core/pull/3238

6

Kindly remove the whitespaces on your PR or else you are bound to get the git conflict.

1 Like
7

the conflicts are coming from

api/src/main/java/org/openmrs/api/db/DelegatingFullTextSession.java

web/src/main/java/org/openmrs/web/filter/update/UpdateFilter.java

you can look into these classes and see which new changes in HEAD were merged and include them locally

1 Like
8

hello @gracebish, where you able to resolve the conflicts ?

9

I am trying my best

10

@gracebish do u mind joining in here https://www.uberconference.com/room/gitacliff and see how fix that

11

Thanks @gcliff. I am done now trying to squash my commits.

1 Like
12

@gracebish you may ignore the squashing of the commits as per resolution here RFC: Favour not squashing commits over squashing commits

13

Thanks very much for the support. i keep following

14

@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

15

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.

1 Like
16

@gracebish kindly have a look at the suggestions @teleivo proposed to simply things

Thanks