Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add Merge Functionality #905

Closed
2 tasks
patgmiller opened this issue Nov 4, 2023 · 1 comment · Fixed by #1044
Closed
2 tasks

Add Merge Functionality #905

patgmiller opened this issue Nov 4, 2023 · 1 comment · Fixed by #1044
Assignees
@patgmiller
Labels
enhancement New feature or request

Comments

@patgmiller
Copy link

patgmiller commented Nov 4, 2023 •
edited

I'd like to help add merge functionality. I didn't find any existing issues, but there does appear to be a stale pull request #442. This can be starting point.

I'll work to finish initial goal of PR #442 and expect that will provide good context and additional direction to move forward with.

  • Add merge default behavior (ff)
  • what's next?
patgmiller added a commit to patgmiller/go-git that referenced this issue Nov 4, 2023
@patgmiller
merge, fast-forward: add stub merge_test.go go-git#905
d39fecc
patgmiller added a commit to patgmiller/go-git that referenced this issue Nov 5, 2023
@patgmiller
merge, fast-forward: pull remote.go in from master. go-git#905
9207d48
@pjbgf pjbgf mentioned this issue Nov 7, 2023
Closed
@pjbgf pjbgf added the enhancement New feature or request label Nov 7, 2023
@pjbgf
Copy link
Member

pjbgf commented Nov 7, 2023

@patgmiller the comments in #442 (comment) still applies. So feel free to propose a new PR to that effect.

@olblak olblak mentioned this issue Feb 12, 2024
Closed
1 task
@pjbgf pjbgf mentioned this issue Mar 9, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@patgmiller patgmiller

Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

git: Implement Merge function with initial FastForwardMerge support pjbgf/go-git
2 participants
@patgmiller @pjbgf