Skip to content

Add JSON editor, canvas area and upload button#9

Open
RaafatSobhy wants to merge 4 commits into
hci-lab:masterfrom
RaafatSobhy:master
Open

Add JSON editor, canvas area and upload button#9
RaafatSobhy wants to merge 4 commits into
hci-lab:masterfrom
RaafatSobhy:master

Conversation

@RaafatSobhy

@RaafatSobhy RaafatSobhy commented Apr 25, 2016

Copy link
Copy Markdown

In this Version :
divide the app page into
1 - JSON Editor
2 - Canvas Area
3 - Buttons to upload the data file

@samehkamaleldin

Copy link
Copy Markdown
Collaborator

You should add more description to what you have done in this pull request, talking about files you've changed and why you did.

@RaafatSobhy

Copy link
Copy Markdown
Author

in the description of the pull request ?

@samehkamaleldin

Copy link
Copy Markdown
Collaborator

نعم، و أيضاً يجب عليك حل التضارب الموجود في الكود قبل أن يتم دمجه

@samehkamaleldin samehkamaleldin changed the title Vis_app_V1.1 Add JSON editor, canvas area and upload button Apr 30, 2016
@RaafatSobhy

Copy link
Copy Markdown
Author
  • check for the new description
  • there is a conflict ?!

@samehkamaleldin

Copy link
Copy Markdown
Collaborator

I've changed the title of the pull request that it would be more meaningful and by way for versioning your releases I think you should read semantic versioning - you should start with ver: 0.0.1

@samehkamaleldin

Copy link
Copy Markdown
Collaborator

yes There are some conflicts please pull the latest code version then merge changes locally then do another pull request

@RaafatSobhy

Copy link
Copy Markdown
Author

Okay , but what are the conflicts you found ?

@samehkamaleldin

Copy link
Copy Markdown
Collaborator

It's an automatic message generated by github at the end of this discussion just above the comment box saying that This branch has conflicts that must be resolved . just pull the latest version of this rep and solve conflict locally and the create a new pull request

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants