EandrewJones commented on PR #476: URL: https://github.com/apache/flagon-useralejs/pull/476#issuecomment-2223219218
@Suvendu-UI Are you sure? There's still a conflict on package-lock.json. Are you sure you've pulled down the most up-to-date changes from the upstream repo, i.e. `apache/flagon-useralejs` as opposed to just your fork (`Suvendu-UI/flagon-useralejsGSOC`)? I see you're working directly off master on your fork (not recommended, but okay for now). That changes the steps slightly. To be more explicit: 1. `git checkout master` 2. `git pull upstream master` where upstream points to the apache repo 3. `git push origin master` where origin points to your fork 4. This will raise a conflict in your `package-lock.json`. You should be able to resolve it by simply deleting the file, then re-installing `npm install`. 5. Commit your changes and push them to your fork. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@flagon.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: notifications-unsubscr...@flagon.apache.org For additional commands, e-mail: notifications-h...@flagon.apache.org
