1Take the pain out of Git conflict resolution: use diff3 (opens in new tab)(blog.nilbus.com)2nilbus8y ago0Save
2Git rebase workflow is not better for conflict resolution (opens in new tab)(stackoverflow.com)2nilbus14y ago3Save
3Use capistrano to deploy Rails apps to Windows servers (opens in new tab)(github.com)GitHub2nilbus14y ago0Save