How to resolve merge conflict in xib file with Xcode 10
.everyoneloves__top-leaderboard:empty,.everyoneloves__mid-leaderboard:empty,.everyoneloves__bot-mid-leaderboard:empty height:90px;width:728px;box-sizing:border-box;
0
I am using Xcode 10 to merge two branches. I'm get conflict in .xib file.
Unfortunately Xcode 10 not showing any changes with highlight and proper position of conflicts:
but in .swift file it work fine and show changes with highlight:
ios git version-control xcode10
asked Nov 16 '18 at 11:25
SPatelSPatel
1,82621429
add a comment |
0
I am using Xcode 10 to merge two branches. I'm get conflict in .xib file.
Unfortunately Xcode 10 not showing any changes with highlight and proper position of conflicts:
but in .swift file it work fine and show changes with highlight:
ios git version-control xcode10
asked Nov 16 '18 at 11:25
SPatelSPatel
1,82621429
it is difficult to fix storyboard / xml file conflicts I suggest you to ignore one person change and manually do it
– Prashant Tukadiya
Nov 16 '18 at 11:28
@PrashantTukadiya Thanks, and i kow how to resolve it but Xcode not showing proper position of conflicts
– SPatel
Nov 16 '18 at 11:31
There aren't conflicts in the xib?
– Kerberos
Nov 16 '18 at 11:40
@Kerberos conflicts is there.
– SPatel
Nov 16 '18 at 12:11
Due it could be a bit tricky I always merge and ignore my changes (conflicting ones) on the storyboard and I use two instances of Xcode, one with my stuff and one with the merged code (without the conflicting files), and manually add my stuff into the storyboard.
– Fede Henze
Nov 16 '18 at 12:22
add a comment |
0
0
0
I am using Xcode 10 to merge two branches. I'm get conflict in .xib file.
Unfortunately Xcode 10 not showing any changes with highlight and proper position of conflicts:
but in .swift file it work fine and show changes with highlight:
ios git version-control xcode10
asked Nov 16 '18 at 11:25
SPatelSPatel
1,82621429
I am using Xcode 10 to merge two branches. I'm get conflict in .xib file.
Unfortunately Xcode 10 not showing any changes with highlight and proper position of conflicts:
but in .swift file it work fine and show changes with highlight:
ios git version-control xcode10
ios git version-control xcode10
asked Nov 16 '18 at 11:25
SPatelSPatel
1,82621429
asked Nov 16 '18 at 11:25
SPatelSPatel
1,82621429
edited Nov 16 '18 at 12:14
SPatel
asked Nov 16 '18 at 11:25
SPatelSPatel
1,82621429
asked Nov 16 '18 at 11:25
SPatelSPatel
1,82621429
asked Nov 16 '18 at 11:25
SPatelSPatel
1,82621429
1,82621429
it is difficult to fix storyboard / xml file conflicts I suggest you to ignore one person change and manually do it
– Prashant Tukadiya
Nov 16 '18 at 11:28
@PrashantTukadiya Thanks, and i kow how to resolve it but Xcode not showing proper position of conflicts
– SPatel
Nov 16 '18 at 11:31
There aren't conflicts in the xib?
– Kerberos
Nov 16 '18 at 11:40
@Kerberos conflicts is there.
– SPatel
Nov 16 '18 at 12:11
Due it could be a bit tricky I always merge and ignore my changes (conflicting ones) on the storyboard and I use two instances of Xcode, one with my stuff and one with the merged code (without the conflicting files), and manually add my stuff into the storyboard.
– Fede Henze
Nov 16 '18 at 12:22
add a comment |
it is difficult to fix storyboard / xml file conflicts I suggest you to ignore one person change and manually do it
– Prashant Tukadiya
Nov 16 '18 at 11:28
@PrashantTukadiya Thanks, and i kow how to resolve it but Xcode not showing proper position of conflicts
– SPatel
Nov 16 '18 at 11:31
There aren't conflicts in the xib?
– Kerberos
Nov 16 '18 at 11:40
@Kerberos conflicts is there.
– SPatel
Nov 16 '18 at 12:11
Due it could be a bit tricky I always merge and ignore my changes (conflicting ones) on the storyboard and I use two instances of Xcode, one with my stuff and one with the merged code (without the conflicting files), and manually add my stuff into the storyboard.
– Fede Henze
Nov 16 '18 at 12:22
it is difficult to fix storyboard / xml file conflicts I suggest you to ignore one person change and manually do it
– Prashant Tukadiya
Nov 16 '18 at 11:28
it is difficult to fix storyboard / xml file conflicts I suggest you to ignore one person change and manually do it
– Prashant Tukadiya
Nov 16 '18 at 11:28
@PrashantTukadiya Thanks, and i kow how to resolve it but Xcode not showing proper position of conflicts
– SPatel
Nov 16 '18 at 11:31
@PrashantTukadiya Thanks, and i kow how to resolve it but Xcode not showing proper position of conflicts
– SPatel
Nov 16 '18 at 11:31
There aren't conflicts in the xib?
– Kerberos
Nov 16 '18 at 11:40
There aren't conflicts in the xib?
– Kerberos
Nov 16 '18 at 11:40
@Kerberos conflicts is there.
– SPatel
Nov 16 '18 at 12:11
@Kerberos conflicts is there.
– SPatel
Nov 16 '18 at 12:11
Due it could be a bit tricky I always merge and ignore my changes (conflicting ones) on the storyboard and I use two instances of Xcode, one with my stuff and one with the merged code (without the conflicting files), and manually add my stuff into the storyboard.
– Fede Henze
Nov 16 '18 at 12:22
Due it could be a bit tricky I always merge and ignore my changes (conflicting ones) on the storyboard and I use two instances of Xcode, one with my stuff and one with the merged code (without the conflicting files), and manually add my stuff into the storyboard.
– Fede Henze
Nov 16 '18 at 12:22
add a comment |
0
active
oldest
votes
Your Answer
StackExchange.ifUsing("editor", function ()
StackExchange.using("externalEditor", function ()
StackExchange.using("snippets", function ()
StackExchange.snippets.init();
);
);
, "code-snippets");
StackExchange.ready(function()
var channelOptions =
tags: "".split(" "),
id: "1"
;
initTagRenderer("".split(" "), "".split(" "), channelOptions);
StackExchange.using("externalEditor", function()
// Have to fire editor after snippets, if snippets enabled
if (StackExchange.settings.snippets.snippetsEnabled)
StackExchange.using("snippets", function()
createEditor();
);
else
createEditor();
);
function createEditor()
StackExchange.prepareEditor(
heartbeatType: 'answer',
autoActivateHeartbeat: false,
convertImagesToLinks: true,
noModals: true,
showLowRepImageUploadWarning: true,
reputationToPostImages: 10,
bindNavPrevention: true,
postfix: "",
imageUploader:
brandingHtml: "Powered by u003ca class="icon-imgur-white" href="https://imgur.com/"u003eu003c/au003e",
contentPolicyHtml: "User contributions licensed under u003ca href="https://creativecommons.org/licenses/by-sa/3.0/"u003ecc by-sa 3.0 with attribution requiredu003c/au003e u003ca href="https://stackoverflow.com/legal/content-policy"u003e(content policy)u003c/au003e",
allowUrls: true
,
onDemand: true,
discardSelector: ".discard-answer"
,immediatelyShowMarkdownHelp:true
);
);
draft saved
draft discarded
Sign up or log in
StackExchange.ready(function ()
StackExchange.helpers.onClickDraftSave('#login-link');
);
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
StackExchange.ready(
function ()
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f53336925%2fhow-to-resolve-merge-conflict-in-xib-file-with-xcode-10%23new-answer', 'question_page');
);
Post as a guest
Required, but never shown
0
active
oldest
votes
0
active
oldest
votes
active
oldest
votes
active
oldest
votes
draft saved
draft discarded
Thanks for contributing an answer to Stack Overflow!
- Please be sure to answer the question. Provide details and share your research!
But avoid …
- Asking for help, clarification, or responding to other answers.
- Making statements based on opinion; back them up with references or personal experience.
To learn more, see our tips on writing great answers.
draft saved
draft discarded
Sign up or log in
StackExchange.ready(function ()
StackExchange.helpers.onClickDraftSave('#login-link');
);
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
StackExchange.ready(
function ()
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f53336925%2fhow-to-resolve-merge-conflict-in-xib-file-with-xcode-10%23new-answer', 'question_page');
);
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function ()
StackExchange.helpers.onClickDraftSave('#login-link');
);
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function ()
StackExchange.helpers.onClickDraftSave('#login-link');
);
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function ()
StackExchange.helpers.onClickDraftSave('#login-link');
);
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
it is difficult to fix storyboard / xml file conflicts I suggest you to ignore one person change and manually do it
– Prashant Tukadiya
Nov 16 '18 at 11:28
@PrashantTukadiya Thanks, and i kow how to resolve it but Xcode not showing proper position of conflicts
– SPatel
Nov 16 '18 at 11:31
There aren't conflicts in the xib?
– Kerberos
Nov 16 '18 at 11:40
@Kerberos conflicts is there.
– SPatel
Nov 16 '18 at 12:11
Due it could be a bit tricky I always merge and ignore my changes (conflicting ones) on the storyboard and I use two instances of Xcode, one with my stuff and one with the merged code (without the conflicting files), and manually add my stuff into the storyboard.
– Fede Henze
Nov 16 '18 at 12:22