Skip to content

Commit 6ac87ef

Browse files
authored
Merge branch 'main' into mbtools/abap-lang-vers
2 parents 59d4a4a + cec2106 commit 6ac87ef

File tree

2 files changed

+30
-7
lines changed

2 files changed

+30
-7
lines changed

src/user-guide/projects/online/first-project.md

+16-6
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,30 @@ order: 40
66

77
## Repository Setup
88

9-
* Create the repsitory on GitHub, make sure it contains someting eg. a README file
9+
* Create the repository on GitHub, and make sure it contains something like a README file
1010
* Start `ZABAPGIT`
1111
* Clone the repository into abapGit
1212

1313
## Adding Objects
1414

15-
* Navigate to the repository, click the "add" link
16-
* It will ask which object to add, select the object
17-
* The object will be commited to the repository
15+
* Navigate to the repository, click the "Add" link
16+
* It will ask which object to add, then select the object
17+
* The object will be committed to the repository
1818

1919
## Modifying Objects
2020

21-
After modifying a object, a "commit" link will show up in abapGit, click this to commit the changes to the remote repository.
21+
After modifying an object, a "commit" link will show up in abapGit. Click this to commit the changes to the remote repository.
2222

2323
## Modifying Repository
2424

25-
If something is changed in the repository, a "pull" link will show up in abapGit. The changes must be pulled before new objects can be changed or added.
25+
If something is changed in the repository, a "pull" link will show up in abapGit. The changes must be pulled before new objects can be changed or added.
26+
27+
## Handling Licenses
28+
29+
Open-source projects on GitHub typically include a `LICENSE` file that describes the repository's licensing terms.
30+
31+
:::info
32+
Note: This license file will not be pulled into SAP systems by abapGit.
33+
34+
If your license requires, include the license terms in the comments of your main source code file. Alternatively, you can reference the license using an [SPDX License Identifier](https://spdx.dev/learn/handling-license-info/).
35+
:::

src/user-guide/reference/flow.md

+14-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,17 @@ category: reference
44
order: 90
55
---
66

7-
BETA feature, use this if you know what you are doing
7+
BETA FEATURE
8+
9+
The abapGit flow page helps mirroring branches/pull requests into/from transports by doing filtered git operations. This way, it is possible to work on multiple branches in one system, or pull multiple branches into a system.
10+
11+
:::warning
12+
Filtered git operations is not a real git thing, its something else than git. It is a workable compromise to work with git in a multi user system
13+
:::
14+
15+
The flow page gives an overview of all features that a developer is working on across their favorite repositories.
16+
17+
## Enabling
18+
19+
To enable a repository to work with flow, go to the local repository settings and tick "Flow Page".
20+
Furthermore, developers must set their favorite repositories, so abapGit knows which parts each developer is working on.

0 commit comments

Comments
 (0)