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.

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

feat(lanes), introduce a new sub-command "merge-move" #8834

Merged
merged 1 commit into from
Apr 26, 2024

Conversation

davidfirst
Copy link
Member

This command is useful when you got a messy merge state that from one hand you don't want to loose the changes, but on the other hand, you want to keep your lane without those changes.
This command does the following:

  1. create a new lane with the current merge state. including all the filesystem changes. (in practice, it leaves the fs intact).
  2. reset the current lane to the state before the merge, so then once done with the new lane, you can switch to the current lane and it'll be clean.

@davidfirst davidfirst merged commit 0bfe412 into master Apr 26, 2024
11 checks passed
@davidfirst davidfirst deleted the lane-merge-move branch April 26, 2024 17:00
luvkapur pushed a commit that referenced this pull request May 3, 2024
This command is useful when you got a messy merge state that from one
hand you don't want to loose the changes, but on the other hand, you
want to keep your lane without those changes.
This command does the following:
1. create a new lane with the current merge state. including all the
filesystem changes. (in practice, it leaves the fs intact).
2. reset the current lane to the state before the merge, so then once
done with the new lane, you can switch to the current lane and it'll be
clean.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants