#20 Open
harbulot harbulot
cleonello cleonello

Fix for issue #611

Bitbucket cannot automatically merge this request due to conflicts.

Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:

hg update default
hg pull -r dateaxis_issue https://bitbucket.org/harbulot/jqplot
hg merge dateaxis_issue
hg commit -m 'Merged in harbulot/jqplot/dateaxis_issue (pull request #20)'
  1. Bruno Harbulot avatarBruno Harbulot

See image in issue #611

There are two commits: one with an example showing the problem and another one to suggest a fix.

Comments (0)

Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.