Issue: #15514

Corresponding PR in opencv/opencv_contrib#2769

Hi, @urbste, can you please resolve merge conflicts and consider comments? Thansk!

Please resolve merge conflicts - rebase with the latest master branch

How do I resolve the merge conflicts. Sorry I am not that fit with git rebase from a remote? I did

git fetch origin 
git rebase origin/master

However nothing really happened. And locally I do not get the merge conflicts. What am I doing wrong?

Try the following:

1. Make sure that origin is opencv/opencv:

$ git remote -v

2. Update

git checkout master
git pull origin HEAD

3. Rebase

git rebase master feature/aruco_js_fix

4. Resolve conflict in file
5. git add filename + git rebase --continue
6. git push fork feature/aruco_js_fix -f

Thanks for the tips. Still got problems. I did:

git remote -v
origin	https://github.com/urbste/opencv (fetch)
origin	https://github.com/urbste/opencv (push)
upstream	https://github.com/opencv/opencv (fetch)
upstream	https://github.com/opencv/opencv (push)

origin was not opencv/opencv. So I did

git remote set-url origin https://github.com/opencv/opencv
git checkout master
git pull origin HEAD
git rebase master feature/aruco_js_fix
git mergetool
git rebase --continue

However, I only had one conflict in the documentation file, not the emdingen.py as indicated here on github. So something is still wrong I guess... :(

This is not working:

git push fork feature/aruco_js_fix -f
fatal: 'fork' does not appear to be a git repository

Sorry for the inconveniece. :/

Ok I think I found a solution. I did not rebase but merge the master into my branch.

@urbste, instead of "fork" you had to write your fork name. Anyway, now it's OK.

@dkurt I do have some more significant changes in the Aruco module, that we would also like to share with the community. I still have forked the repositories in my github account. However I would like to transfer the repositories to my companies github team. Do you know if this PR will be influenced by that?

@urbste, aruco module is located in a separate repository. OPENCV_EXTRA_MODULES_PATH can with with any custom path to modules.

I think this issue is also related to this PR: opencv/opencv_contrib#2526