diff options
| author | Paulo Gomes <paulo.gomes@suse.com> | 2024-03-09 09:00:21 +0000 |
|---|---|---|
| committer | Paulo Gomes <paulo.gomes@suse.com> | 2024-03-09 09:00:21 +0000 |
| commit | 3ee5bc9dd308a5503d60cc26d17d7f10df28c37a (patch) | |
| tree | cdc736274162b804e12d4bd55617b5811d470248 /COMPATIBILITY.md | |
| parent | 4bed23037f0e374d85bce1506e9df98ce0cfcd32 (diff) | |
| download | go-git-3ee5bc9dd308a5503d60cc26d17d7f10df28c37a.tar.gz | |
git: Implement Merge function with initial FastForwardMerge support
Introduces the Merge function for merging branches in the codebase.
Currently, the function only supports FastForwardMerge strategy, meaning it
can efficiently update the target branch pointer if the source branch history
is a linear descendant.
Support for additional merge strategies (e.g., three-way merge) will be added
in future commits.
Signed-off-by: Paulo Gomes <paulo.gomes@suse.com>
Diffstat (limited to 'COMPATIBILITY.md')
| -rw-r--r-- | COMPATIBILITY.md | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/COMPATIBILITY.md b/COMPATIBILITY.md index c1f280d..ff0c22c 100644 --- a/COMPATIBILITY.md +++ b/COMPATIBILITY.md @@ -27,14 +27,14 @@ compatibility status with go-git. ## Branching and merging -| Feature | Sub-feature | Status | Notes | Examples | -| ----------- | ----------- | ------ | --------------------------------------- | ----------------------------------------------------------------------------------------------- | -| `branch` | | ✅ | | - [branch](_examples/branch/main.go) | -| `checkout` | | ✅ | Basic usages of checkout are supported. | - [checkout](_examples/checkout/main.go) | -| `merge` | | ❌ | | | -| `mergetool` | | ❌ | | | -| `stash` | | ❌ | | | -| `tag` | | ✅ | | - [tag](_examples/tag/main.go) <br/> - [tag create and push](_examples/tag-create-push/main.go) | +| Feature | Sub-feature | Status | Notes | Examples | +| ----------- | ----------- | ------------ | --------------------------------------- | ----------------------------------------------------------------------------------------------- | +| `branch` | | ✅ | | - [branch](_examples/branch/main.go) | +| `checkout` | | ✅ | Basic usages of checkout are supported. | - [checkout](_examples/checkout/main.go) | +| `merge` | | ⚠️ (partial) | Fast-forward only | | +| `mergetool` | | ❌ | | | +| `stash` | | ❌ | | | +| `tag` | | ✅ | | - [tag](_examples/tag/main.go) <br/> - [tag create and push](_examples/tag-create-push/main.go) | ## Sharing and updating projects |