Skip to content

Conflict resolutions OCB synchronization

Holger Brunn edited this page Jun 20, 2017 · 28 revisions

This page contains links to extra pages describing how conflicts resulting from merges by the @OCA-git-bot (done every night automatically and committed into github.com:OCA/OCB if no conflicts occurred) were resolved manually. Is is structured by branch and day, so expect to find page names in the form $branch-yyyy-mm-dd.

Note that non-trivial conflict resolutions will be offered as a pull request and linked here, too.

8.0-2016-06-19

9.0-2017-05-31

8.0-2016-12-25

8.0-2016-05-28

7.0-2016-05-18

8.0-2016-04-28

8.0 2016 04 05

9.0 2016-01-16

8.0 2015-11-30

7.0-2015-09-26

8.0-2015-09-08

7.0-2015-08-18

7.0-2015-08-17

8.0-2015-07-30

8.0-2015-06-26

8.0-2015-06-18

8.0-2015-06-17

7.0-2015-06-02

7.0-2015-04-07

7.0-2015-03-27

7.0-2015-03-04

7.0-2015-02-14

8.0-2015-02-14

8.0-2015-02-06

7.0-2015-01-23

7.0-2015-01-16

7.0-2015-01-15

7.0-2015-01-08

7.0-2014-12-03

7.0 2014 11 27

7.0 2014 11 05

7.0 2014 11 04

7.0 2014 10 29

7.0 2014 09 24

You can’t perform that action at this time.