Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on Jul 29, 2019. It is now read-only.

Conversation

@chrisbenseler
Copy link
Contributor

I have added the pt-br messages to the network from Vis.

@mojoaxel
Copy link
Member

mojoaxel commented Aug 29, 2016

@chrisbenseler Thank You very much!
Sadly we expect pull-request against the develop branch not the master branch.
Also you deleted images in the dist folder. If it is too much of a hassle to switch the branch now I'll merge your PR manually in develop.

But please reset the dist folder first by doing this in your master branch:

git checkout -- dist
git commit --amend --no-edit
git push --force

Thanks again!

@chrisbenseler
Copy link
Contributor Author

chrisbenseler commented Aug 29, 2016

@mojoaxel I'll do it (submit to the development branch)

About the images, I didn delete it manually. By some (unknown reason) for me, they were delete after I ran 'npm run build' :S
Sorry for that, I thought this behaviour was expected.

@chrisbenseler
Copy link
Contributor Author

chrisbenseler commented Aug 29, 2016

@mojoaxel I have already done the PR to the develop branch, with the images.

FYI, I tried to run again the npm run build, than git status:

npm run build

[email protected] build /home/christian/dev/projects/vis
 gulp

[10:20:32] Using gulpfile ~/dev/projects/vis/gulpfile.js
[10:20:32] Starting 'clean'...
[10:20:32] Starting 'bundle-js'...
[10:20:32] Starting 'bundle-js-individual'...
[10:20:32] Starting 'bundle-css'...
[10:20:32] Finished 'clean' after 111 ms
[10:20:32] Starting 'copy'...

git status
On branch master
Your branch is up-to-date with 'origin/master'.
Changes not staged for commit:
  (use "git add/rm <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

    deleted:    dist/img/network/deleteIcon.png
    deleted:    dist/img/network/downArrow.png
    deleted:    dist/img/network/editIcon.png
    deleted:    dist/img/network/leftArrow.png
    deleted:    dist/img/network/minus.png
    deleted:    dist/img/network/plus.png
    deleted:    dist/img/network/rightArrow.png
    deleted:    dist/img/network/upArrow.png
    deleted:    dist/img/network/zoomExtends.png

The build is deleting those images. Maybe it's something with my OS?
I'm on an Ubuntu 16.04

@mojoaxel
Copy link
Member

The build is deleting those images. Maybe it's something with my OS? I'm on an Ubuntu 16.04

That's not your fault! I think the dist folder should be ignored in the develop branch. But I'm not yet sure how to do this elegantly without breaking the merging with master before a release.
The best way at the moment ist to reset the dist folder (git checkout -- dist) before pushing the changes.

Nice! Im also on ubuntu 16.04 ;-)

@mojoaxel
Copy link
Member

replaced with #2052

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants