-
Notifications
You must be signed in to change notification settings - Fork 35
Grammar and other changes #33
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
thecodingdoc1
wants to merge
38
commits into
strongbox:master
Choose a base branch
from
thecodingdoc1:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 16 commits
Commits
Show all changes
38 commits
Select commit
Hold shift + click to select a range
e43db55
Update rebase-vs-merge.md
thecodingdoc1 ec0abb5
Update
thecodingdoc1 8ec340d
Update strongbox-authorization-yaml.md
thecodingdoc1 f16bfd6
Revert "Update strongbox-authorization-yaml.md"
thecodingdoc1 e042280
Update strongbox-authorization-yaml.md
thecodingdoc1 9adec0d
Deleted TODO
thecodingdoc1 058e0b7
Update application-properties.md
thecodingdoc1 514c2d7
Removed TODO
thecodingdoc1 335838b
Corrections
thecodingdoc1 d1c8a10
Update artifact-query-language.md
thecodingdoc1 8bbbbb9
Grammer update
thecodingdoc1 f487dcb
Grammer updates
thecodingdoc1 ce8cd57
Update rebase-vs-merge.md
thecodingdoc1 54806e3
Update rebase-vs-merge.md
thecodingdoc1 f403623
Update artifact-query-language.md
thecodingdoc1 2beb706
Update artifact-query-language.md
thecodingdoc1 0cc5a76
Update artifact-query-language.md
carlspring 61c915f
Update getting-started.md
thecodingdoc1 6f01e56
More minor grammar corrections
thecodingdoc1 6681ff2
Merge branch 'master' of https://github.com/thecodingdoc1/strongbox-docs
thecodingdoc1 53643ed
Update coding-convention.md
thecodingdoc1 259d9d9
Merge branch 'master' of https://github.com/thecodingdoc1/strongbox-docs
thecodingdoc1 9a2058c
Update docs/developer-guide/building-the-code-with-docker.md
thecodingdoc1 9f048da
Links
thecodingdoc1 ee09c7a
Comments
thecodingdoc1 f46675d
Merge branch 'master' of https://github.com/thecodingdoc1/strongbox-docs
thecodingdoc1 3411f00
Update coding-convention.md
thecodingdoc1 408105d
Update getting-started-with-persistence.md
thecodingdoc1 87f03ee
Update how-to-implement-spring-controllers.md
thecodingdoc1 4eca792
Update using-the-event-api.md
thecodingdoc1 5a2e2df
Link correction
thecodingdoc1 988ebc9
Update how-to-implement-your-own-repository-format.md
thecodingdoc1 4b6d64b
Update layout provider pages
thecodingdoc1 da43b5d
Update maven-metadata.md
thecodingdoc1 44f5fec
Updated and corrected links
thecodingdoc1 8d01ded
Update logging.md
thecodingdoc1 128d37e
Update maven-indexer.md
thecodingdoc1 bc9ac58
update
thecodingdoc1 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,7 +3,7 @@ | |
## Conceptual Overview | ||
|
||
The first thing to understand about `git rebase` is that it solves the same problem as git merge. Both of these commands | ||
are designed to integrate changes from one branch into another branch—they just do it in very different ways. | ||
are designed to integrate changes from one branch into another branch. They just do it in very different ways. | ||
|
||
Consider what happens when you start working on a new feature in a dedicated branch, then another team member updates | ||
the `master` branch with new commits. This results in a forked history, which should be familiar to anyone who has used | ||
|
@@ -18,7 +18,7 @@ new commits into your `feature` branch, you have two options: `merging` or `reba | |
|
||
??? danger "Please avoid using this option!" | ||
Please avoid using this option. It creates unnecessary noise in your PRs and makes it ***extremely*** hard to | ||
follow your real changes. We have included this information because it will give you better understanding of why we | ||
follow your real changes. We have included this information because it will give you a better understanding of why we | ||
prefer `rebasing` over `merging`. | ||
|
||
The easiest option is to merge the `master` branch into the feature branch using something like the following: | ||
|
@@ -51,15 +51,15 @@ to understand the history of the project or branch you are working on. | |
|
||
!!! success "We prefer this option over `merging`" | ||
|
||
As an alternative to merging, you can rebase the feature branch onto master branch using the following commands: | ||
As an alternative to merging, you can rebase the feature branch onto the master branch using the following commands: | ||
|
||
``` | ||
git checkout feature | ||
git rebase master | ||
``` | ||
|
||
This moves the entire `feature` branch to begin on the tip of the master branch, effectively incorporating all of | ||
the new commits in `master`. But, instead of using a `merge` commit, `rebasing` re-writes the project history by | ||
the new commits in `master`. Instead of using a `merge` commit, `rebasing` re-writes the project history by | ||
creating brand new commits for each commit in the original branch. | ||
|
||
 | ||
|
@@ -97,7 +97,7 @@ However, before executing this command, please be **sure** nobody else is workin | |
## But how do I rebase? | ||
|
||
Before you start, it is a good idea to backup your current project. If this is your first time doing a rebase, you can | ||
screw things up and loose/damage the work you've already done. So better safe, than sorry. (If you are a pro - what are | ||
screw things up and lose/damage the work you've already done. So better safe than sorry. (If you are a pro - what are | ||
you even doing here? :smile: ) | ||
|
||
|
||
|
@@ -114,10 +114,10 @@ Steps: | |
```linenums="1" | ||
$ git remote add upstream [email protected]:strongbox/strongbox.git | ||
$ git remote -v | ||
origin [email protected]:your-username/strongbox.git (fetch) | ||
origin [email protected]:your-username/strongbox.git (push) | ||
upstream [email protected]:strongbox/strongbox.git (fetch) | ||
upstream [email protected]:strongbox/strongbox.git (push) | ||
origin [email protected]:your-username/strongbox.git (fetch) | ||
origin [email protected]:your-username/strongbox.git (push) | ||
upstream [email protected]:strongbox/strongbox.git (fetch) | ||
upstream [email protected]:strongbox/strongbox.git (push) | ||
``` | ||
|
||
* Sync your fork | ||
|
@@ -156,7 +156,7 @@ You can also check Idea's manual for [Resolving Conflicts] | |
|
||
#### Command line | ||
|
||
If you are command line lover, you can execute the commands manually: | ||
If you are a command line lover, you can execute the commands manually: | ||
|
||
```linenums="1" | ||
git checkout feature-branch | ||
|
@@ -167,7 +167,7 @@ However, when conflicts arise, it could be a bit challenging to fix them from yo | |
|
||
#### Finally | ||
|
||
Once you are done rebasing and you have ensured that the code builds as well as the tests are passing, then you will | ||
Once you are done rebasing and you have ensured that the code builds and the tests are passing, then you will | ||
need to force push your branch (remember the [Force Pushing](#force-pushing) section?) | ||
|
||
``` | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,9 @@ | ||
## Intro | ||
|
||
The user management module allows you to list/add/update/delete users fine-tune their access level to Strongbox. | ||
The user management module allows you to list/add/update/delete users and fine-tune their access level to Strongbox. | ||
|
||
<img src="/assets/screenshots/08-user-management.png" data-zoomable="true" /> | ||
|
||
## Access Model | ||
|
||
TODO: Add mode information about this later. (SB-1339; SB-1285) | ||
thecodingdoc1 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.