← Back to context Comment by dotancohen 12 days ago You could wait a bit after forking. 4 comments dotancohen Reply Towaway69 12 days ago Squash commit can fix the conflict. mmh0000 12 days ago Doesn't work if there are too many diffs Towaway69 12 days ago Diffs can always be patched up.
Towaway69 12 days ago Squash commit can fix the conflict. mmh0000 12 days ago Doesn't work if there are too many diffs Towaway69 12 days ago Diffs can always be patched up.
mmh0000 12 days ago Doesn't work if there are too many diffs Towaway69 12 days ago Diffs can always be patched up.
Squash commit can fix the conflict.
Doesn't work if there are too many diffs
Diffs can always be patched up.