Hello Pierre,

The link you sent is:

https://github.com/darktable-org/darktable/pull/1739

At the bottom of the page I see error reported by GtiHub saying that there
is conflicts.

Also your branch has multiple "merge with... ", "merge remote-tracking..."

To clean-up the history, and since you've committed on your master branch:

1. update your darktable to latest version of master (git pull --rebase)
2. resolve conflicts if any
3. force push your branch : git push mepi0011 master

Hope this helps. Thanks.

-- 
  Pascal Obry /  Magny Les Hameaux (78)

  The best way to travel is by means of imagination

  http://photos.obry.net
  http://www.obry.net

  gpg --keyserver keys.gnupg.net --recv-key F949BD3B

___________________________________________________________________________
darktable developer mailing list
to unsubscribe send a mail to darktable-dev+unsubscr...@lists.darktable.org

Reply via email to