Skip to content

Snap branches to only be on branches #6

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
Closed
epage opened this issue Jul 31, 2021 · 1 comment · Fixed by #150
Closed

Snap branches to only be on branches #6

epage opened this issue Jul 31, 2021 · 1 comment · Fixed by #150
Labels
enhancement Improve the expected

Comments

@epage
Copy link
Collaborator

epage commented Jul 31, 2021

Say I'm developing on branch feature1. I then start on feature2. I then go back and add a commit to feature1. feature2 isn't based on feature1 anymore, but a stray commit.

It'd be nice if we could "snap" feature2 to be based on the latest feature1.

The challenge will be in identifying which shared commits belong to which branch.
@epage epage added the enhancement Improve the expected label Jul 31, 2021
@epage
Copy link
Collaborator Author

epage commented Aug 19, 2021

depot-tools avoids this problem with rebase-update by marking the parent branch as upstream.

The downsides are:

  • Always keeping it correct
  • git push possibly not doing what a user expects

epage added a commit that referenced this issue Aug 27, 2021
@epage
refactor(graph): Delinearize by default
f77adb8 
This will help us avoid biasing our algorithms based on implementation,
like we could do with #6.

This involved an audit of different graph ops to see if this would have
an impact on them.
epage added a commit that referenced this issue Oct 29, 2021
@epage
feat(graph): Align stacks on repair
cffa488 
Auto-repair is starting off-by-default as we get runtime to see how well
we trust it.

Our backup approach in case aligning by time doesn't work is to prefer
HEAD.

Fixes #6
@epage epage mentioned this issue Oct 29, 2021
Merged
epage added a commit that referenced this issue Oct 6, 2023
@epage
Merge pull request #6 from peter-kehl/readme_use_crates_io_link_place…
8499939 
…holder

README.md 'Crates Status' icon link
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
enhancement Improve the expected
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

feat(graph): Align stacks on repair gitext-rs/git-stack
1 participant
@epage