Your solution is still valid if changes are just adding new VCs, but if conflict are within a VC itself, it won't be that viable. For me, I prefer to work using individual XIP files for every view file, including VCs.
Hi Sam, this is a great tutorial. Plz make a video on, how to clone a bitbucket repository which is a ReactNative Project, open and work on iOS native module in Xcode. Thanks..
Is using multiple storyboards reference like that is common to avoid merge conflict? I never work in a software company. Thank you very much for the video 🙂
Creating a new storyboard for each view controller or feature is one way to avoid merge conflicts when working in a team setting. Engineering teams are opting out of using storyboard files entirely to create their views, and instead are creating them programmatically. This makes resolving merge conflicts even easier, and allows for a single source of truth to be established - avoiding the need jump between storyboard and code files to resolve any issues.
Thank you Sam. My friends and I are working on a project together and we were frustrated by those conflicts in the xml file. Great Video, great Job !
Really really helpful....no one teaches solution for these issues...
Thank you veryyyyy much....
🤗
nice video bro
It is so elegant and simple approach! I love it :)
Your solution is still valid if changes are just adding new VCs, but if conflict are within a VC itself, it won't be that viable.
For me, I prefer to work using individual XIP files for every view file, including VCs.
White VS Code theme! Ahhhhhh! 😱
Another great video Sam! Makes me want to take up iOS development.
I have a good excuse, I promise. I was coding at the beach, so I needed the white theme to see in the sun. I just forgot to change my settings back. 😬
Great Video Sam!! It's very helpful for us(Developer :D )
really great video, looking forward to more like this.🙂
Really nice tutorial! Thank you very much and congrats!
Glad you liked it!
Hi Sam, this is a great tutorial. Plz make a video on, how to clone a bitbucket repository which is a ReactNative Project, open and work on iOS native module in Xcode. Thanks..
Wow, this is really helpful, thank you.
Thanks so much!
You’re welcome 🤗
Is using multiple storyboards reference like that is common to avoid merge conflict? I never work in a software company.
Thank you very much for the video 🙂
Creating a new storyboard for each view controller or feature is one way to avoid merge conflicts when working in a team setting.
Engineering teams are opting out of using storyboard files entirely to create their views, and instead are creating them programmatically.
This makes resolving merge conflicts even easier, and allows for a single source of truth to be established - avoiding the need jump between storyboard and code files to resolve any issues.
🤗
🤗