search

sergey-su / logjoint

LogJoint log viewer core. Viewer plugins for publicly-available domains.
MIT License
55 stars 13 forks source link

Merge branch 'origin/master' into msft #7

Closed pnelson786 closed 6 years ago

pnelson786 commented 6 years ago

I am merging all the master changes to msft branch to get the latest and the greatest.

sergey-su commented 6 years ago

As long as you have npintomicrosoft fork, sergey-su:msft is not needed. Can I delete it?

You merge sergey-su:master -> npintomicrosoft:master to update your fork with latest core code. You rebase npintomicrosoft:msft on top of npintomicrosoft:master to reapply msft-specific changes (if any) on top of the core code. You build from npintomicrosoft:msft.

pnelson786 commented 6 years ago

Currently sergey-su:msft is setup as base account everyone in my team can use. We have added sergey-su:msft as git submodule to our team git repo where we add our extensions. I would need an team account. Can we do this next time. I need to check for how to setup team account and a secure way to store password accessible to all. For now let it get merged.