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

Is branch merging and rebasing actually supported? #686

Closed
Logarithmus opened this issue May 7, 2021 · 5 comments
Closed

Is branch merging and rebasing actually supported? #686

Logarithmus opened this issue May 7, 2021 · 5 comments

Comments

@Logarithmus
Copy link

Logarithmus commented May 7, 2021 •
edited

Hello again! I continue learning gitui, but unfortunately didn't find how to merge and/or rebase branches. I see only checkout option in branches popup.
Related: #302, #91
@extrawurst
Copy link
Owner

you cannot merge arbitrary branches into your current branch yet, no.

@Logarithmus
Copy link
Author

Logarithmus commented May 7, 2021 •
edited

you cannot merge arbitrary branches into your current branch yet, no.

Is anyone working on this feature? I see #32, but no PRs.

@extrawurst
Copy link
Owner

no because it kind of depends on #485 to first land, so that not only super-happy-path merges work

@extrawurst
Copy link
Owner

@Logarithmus as of 4f6aceb merging a branch is supported, but there is a bit of stuff missing: #485 (comment)

@extrawurst
Copy link
Owner

extrawurst commented May 24, 2021 •
edited

Closing as dup of #32 - merge is supported by now

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@extrawurst @Logarithmus