branch merge from upstream #384
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 10 commits
February 27, 2021 17:56
# Conflicts: # asyncgit/src/sync/mod.rs # asyncgit/src/sync/remotes.rs
extrawurst
pushed a commit
that referenced
this pull request
May 27, 2021
* better structure of all branch functions * support and unittest fast forward merge
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
related to #319
this brings support for fast forward merging when pressing the currently un-advertised
fkey.it will perform a fetch followed by trying to do a ff-merge if anything is incoming.
todo:
cleanstate (in prep for merging)