You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
I offer to do a whiteboard-style informal technical talk about incremental merging in Git. This is a style of merging in which commits from two branches are merged pairwise, allowing conflicts to be resolved at a very fine granularity. I think it's a cool idea and has some interesting theoretical aspects. See introduction and links therein.
I've just released an experimental version of git-imerge, a tool for automating incremental merges.
The text was updated successfully, but these errors were encountered:
I offer to do a whiteboard-style informal technical talk about incremental merging in Git. This is a style of merging in which commits from two branches are merged pairwise, allowing conflicts to be resolved at a very fine granularity. I think it's a cool idea and has some interesting theoretical aspects. See introduction and links therein.
I've just released an experimental version of git-imerge, a tool for automating incremental merges.
The text was updated successfully, but these errors were encountered: