Added line that selects the "More modules..." after adding a step. #706
Conversation
* Add manifest.json * cache static assets for offline use * update cache * add meta theme-color and change static files to be cache * cache the files on network request * caching on first run Signed-off-by: tech4GT <varun.gupta1798@gmail.com> * add a button to clear cache * add styling to clear cache link
I've arranged the modules in alphabetical order.
|
Thanks for opening this pull request! |
|
@publiclab/is-reviewers thanks! |
|
@gfting you don't have to add the green tick in the checkboxes. They can be interacted with |
|
@publiclab/is-reviewers |
|
Please share a GIF. Thanks! |
|
Please share a GIF of this change in action. |
|
@harshkhandeparkar here's the GIF and the fix! Thanks! |
I guess it's okay , I have tested it locally it works. 🙌 |
|
@gfting awesome. |
|
@harshkhandeparkar your support was seriously incredible during this - thank you very much! |
|
@rexagod I'm not sure what's going on with this branch and conflicts - what should I do? Thanks! |
|
@gfting, please resolve the conflicts by running `git merge upstream/main`
locally. This will add conflict markers to the confliction files. The
marker will marker what is the upstream change(i.e. the file in the
publiclab repo) and the current change(i.e. condition of the file in your
PR). The file has changed in the publiclab repo since some PRs have been
merged ever since you opened your PR. All you have to do is open all of the
source files(not the dist files) and combine both the upstream and current
changes in such a way that both the features work. Then you can run `grunt
build` which will resolve the dist file conflicts. Then you can commit the
changes. You might have to force push the commit. You can ask for help if
you are stuck.
On 24-Jan-2019 9:05 AM, "Gabriel Ting" <notifications@github.com> wrote:
@rexagod <https://github.com/rexagod> I'm not sure what's going on with
this branch and conflicts - what should I do? Thanks!
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#706 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AhKOn0FK0G0vV6XE_pRHfl8WWjNBQQEeks5vGSoYgaJpZM4aPgag>
.
|
|
This link might be helpful. https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/ |
|
@harshkhandeparkar when I run the command, I get the error message |
|
@gfting Try these above suggestions by @harshkhandeparkar, and feel free to let us know if this works out for you or not. We're here to help! ;) |
|
@gfting you will have to add the remote and then merge The |
|
@harshkhandeparkar I followed that, but still got the same error message; ended up doing git fetch and then trying to merge |
|
@gfting did you merge |
|
I'm not sure what happened here - I merged upstream master |
|
@gfting master is not the branch you need to merge, the default branch for image sequencer is |
|
Master is 100s of commits behind main |
|
What you can do is
This is why you should always create a new branch for doing such things so that you can fallback to the main brach in case such things happen. Sorry you have to take a lot of trouble to do this. |
|
It says that I'm already up to date with main |
|
@gfting I dont know why it says that. Did you setup the remote correctly? In any case though, you will have to close this one I guess. Or you can revert the last few commits |
Fixes #697
Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!
npm test@publiclab/reviewersand@publiclab/is-reviewersfor help, in a comment belowIf tests do fail, click on the red
Xto learn why by reading the logs.Please be sure you've reviewed our contribution guidelines at https://publiclab.org/contributing-to-public-lab-software
Thanks!