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

Use new "merge twice" algorithm to resolve push conflicts #1279

Conversation

christian-schilling
Copy link
Member

Change: merge-twice

josh-core/src/history.rs Outdated Show resolved Hide resolved
josh-core/src/history.rs Outdated Show resolved Hide resolved
@christian-schilling christian-schilling force-pushed the @changes/master/christian.schilling.de@gmail.com/merge-twice branch from 49d5e54 to b93937f Compare September 28, 2023 07:52
@christian-schilling christian-schilling force-pushed the @changes/master/christian.schilling.de@gmail.com/merge-twice branch from b93937f to a4015fe Compare September 28, 2023 07:55
@christian-schilling christian-schilling force-pushed the @changes/master/christian.schilling.de@gmail.com/merge-twice branch from a4015fe to 4a9c81e Compare October 13, 2023 09:01
@christian-schilling christian-schilling force-pushed the @changes/master/christian.schilling.de@gmail.com/merge-twice branch 2 times, most recently from fd2938a to c92b9da Compare October 26, 2023 10:11
@christian-schilling christian-schilling force-pushed the @changes/master/christian.schilling.de@gmail.com/merge-twice branch from c92b9da to 1fd2170 Compare October 26, 2023 10:22
@christian-schilling christian-schilling merged commit 2c3f763 into master Oct 26, 2023
1 check passed
@christian-schilling christian-schilling deleted the @changes/master/christian.schilling.de@gmail.com/merge-twice branch October 26, 2023 10:35
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.

None yet

2 participants