You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
where `<seconds>` is the number of seconds git 'remembers' your token. For example, to only have to enter your token once per day:
127
127
128
128
```
@@ -169,7 +169,7 @@ cd <clone_dir_name>
169
169
170
170
### Checking out a tag or switching to a new tag
171
171
172
-
- To check out a tag:
172
+
- To check out a tag:
173
173
```
174
174
git checkout <tag>
175
175
```
@@ -270,7 +270,7 @@ To see the latest tag: [https://github.com/ESCOMP/CAM-SIMA/tags](https://github.
270
270
271
271
### Creating a new tag
272
272
273
-
1. Clone [https://github.com/ESCOMP/CAM](https://github.com/ESCOMP/CAM) or update an existing clone with `git fetch <escomp_remote> development`
273
+
1. Clone [https://github.com/ESCOMP/CAM-SIMA](https://github.com/ESCOMP/CAM-SIMA) or update an existing clone with `git fetch <escomp_remote> development`
274
274
1. Find the PR merge commit (`<merge_commit>`) for the tag
275
275
- In your up-to-date CAM clone, find the merge commit with `git log --oneline -1 <escomp_remote>/development` where the merge commit is the first field in the output.
276
276
1. Tag the `<merge_commit>` with `git tag -a <tag> <merge_commit> -m '<commit_message>` where `<commit_message>` is the same as the message for the `<merge_commit>`
@@ -327,7 +327,7 @@ There is a tool called `diffmerge` which enables both side-by-side comparison of
327
327
328
328
To use the differencing tool type: `git difftool`
329
329
330
-
If after a `git merge` the git command says there are conflicts, then you may type `git mergetool` to allow you to resolve the conflicts and complete the merge. The mergetool with diffmerge properly installed will display three panes. From left to right these panes are:
330
+
If after a `git merge` the git command says there are conflicts, then you may type `git mergetool` to allow you to resolve the conflicts and complete the merge. The mergetool with diffmerge properly installed will display three panes. From left to right these panes are:
331
331
332
332
Code being merged in Merged code Your code
333
333
@@ -363,5 +363,5 @@ If you have problems, check out the tips at the bottom of this page
363
363
364
364
- On derecho, if you get an error message about diffmerge not being loaded, make sure you are using `ncarenv/23.09` or newer (to check say "module list")
365
365
- If you do not get a response when clicking on the "git mergetool" window, make sure you find the "conflict" popup and hit "exit" on it
366
-
- If your git mergetool gives blank windows and says: "Files are identical or equivalent under the current RuleSet", hit OK and then go to the File dropdown menu and select "Reload". This filled in the blank windows for the user with this error.
366
+
- If your git mergetool gives blank windows and says: "Files are identical or equivalent under the current RuleSet", hit OK and then go to the File dropdown menu and select "Reload". This filled in the blank windows for the user with this error.
367
367
- **CAUTION**: Check your file carefully if you do this, as a second user who did this discovered that all of the changes which were automatically merged did not reside in the final saved version.
0 commit comments