"Push-pull-rebase bottleneck: if you rebase and push and someone beats you to it, you have to pull, rebase, and try again.
"Push-pull-rebase bottleneck: if you rebase and push and someone beats you to it, you have to pull, rebase, and try again. This gets worse as commit rate increases and people do needless legwork. Facebook has moved to server-side rebasing on push to mostly eliminate this pain point. (This is part of a still-experimental feature in Mercurial, which should hopefully lose its experimental flag soon.)" What if there are merge conflicts? I don't know about Mercurial, but in Git there are tons of cases where rebasing cannot happen automatically.
Posted by freedrull on Mar 29, 2015, 11:47 AM
Tags
Related issues
- Legit what one of our clients problem was.
- sounds painful, just searched on "how can i get ms office running in linux using wine" and the results included a containerised windows v...
- Appreciate MCP server availability, will help integrate with Claude.
- Maybe a different take, but as someone that manages a large public API that allows anonymous access, IPv6 has been a nightmare to try and...
- Why is there no write through unionfs in Linux?
- > why is there no in-memory kafka server that I can use for simple testing purposes https://github.com/embeddedkafka/...
Raise real-world problems, find people facing the same issue, and discuss solutions.7,500 issues0 comments
hackernews (Sysadmin)
Legit what one of our clients problem was.
sounds painful, just searched on "how can i get ms office running in linux using wine" and the results included a containerised windows v...
Appreciate MCP server availability, will help integrate with Claude.
Maybe a different take, but as someone that manages a large public API that allows anonymous access, IPv6 has been a nightmare to try and...
Why is there no write through unionfs in Linux?
> why is there no in-memory kafka server that I can use for simple testing purposes https://github.com/embeddedkafka/...
> why is there no in-memory kafka server that I can use for simple testing purposes.
I went from daily driving mac and being very used to the desktop environment, and i am really hating everything i've tried in Linux.
"Push-pull-rebase bottleneck: if you rebase and push and someone beats you to it, you have to pull, rebase, and try again.
"Push-pull-rebase bottleneck: if you rebase and push and someone beats you to it, you have to pull, rebase, and try again. This gets worse as commit rate increases and people do needless legwork. Facebook has moved to server-side rebasing on push to mostly eliminate this pain point. (This is part of a still-experimental feature in Mercurial, which should hopefully lose its experimental flag soon.)" What if there are merge conflicts? I don't know about Mercurial, but in Git there are tons of cases where rebasing cannot happen automatically.
Comments (0)
No comments yet. Start the discussion.