-
-
Notifications
You must be signed in to change notification settings - Fork 2.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
1 changed file
with
4 additions
and
4 deletions.
There are no files selected for viewing
This file contains 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 |
---|---|---|
|
@@ -96,7 +96,7 @@ What's strange (mostly an IntelliJ bug): Regardless of CLI or GUI, These changes | |
|
||
For `csl-styles`: | ||
|
||
``` | ||
```BASH | ||
git merge origin/main | ||
git checkout main -- src/main/resources/csl-styles | ||
... git commit ... | ||
|
@@ -109,13 +109,13 @@ And similarly for `csl-locales` or `abbrv.jabref.org`. | |
|
||
1. Edit `.gitmodules`: comment out `ignore = all` (for the respective submodules you are trying to reset) | ||
|
||
``` | ||
```JAVA | ||
# ignore = all | ||
``` | ||
|
||
2. `cd` into the changed submodules directory (lets say `csl-styles` was changed): | ||
Check failure on line 116 in docs/code-howtos/faq.md GitHub Actions / MarkdownOrdered list item prefix
|
||
|
||
``` | ||
```BASH | ||
$ cd src/main/resources/csl-styles | ||
Check failure on line 119 in docs/code-howtos/faq.md GitHub Actions / MarkdownDollar signs used before commands without showing output
|
||
``` | ||
|
||
|
@@ -125,7 +125,7 @@ Here, in the case of `csl-styles`, it is `4e0902d`. | |
|
||
4. Checkout the commit: | ||
Check failure on line 126 in docs/code-howtos/faq.md GitHub Actions / MarkdownOrdered list item prefix
|
||
|
||
``` | ||
```BASH | ||
$ git checkout 4e0902d | ||
Check failure on line 129 in docs/code-howtos/faq.md GitHub Actions / MarkdownDollar signs used before commands without showing output
|
||
``` | ||
|
||
|