I have been developing a feature for my app in Xcode. I use the
What you should do here is merge your
master-branch into your
feature-branch. Fix your conflicts. Test, make sure it works. When you're convinced all is good, merge
feature-branch back into
During this time, you can still work in
master-branch as needed. But keep in mind more conflicts could arise. And in that case, I'd also just do
master-branch where the "->" represents doing a merge.
For conflicts, I actually don't use Xcode to resolve, but there are numerous resources out there to indicate how to do this.