I want to merge my branch “apiIntegrationOnUX” onto the master branch. How can I do that?
I have a master branch. I then created a branch called "apiIntegrationOnUX" so that I could add this integration feature on a branch. Now that this integration feature is complete on this branch, I want to merge it back onto my master branch. The "apiIntegrationOnUX" branch is the most up to date version of the app and contains all the same code as the master branch, with the addition of my new feature. I am having a difficult time successfully merging the two branches. I have checked a few guides and when I get to the end point of many of them, I get this message:
$ git pull origin apiIntegrationOnUX From
https://github.com/Westopher/solariOSApp * branch
apiIntegrationOnUX -> FETCH_HEAD warning: Cannot merge binary files:
solariOSApp.xcworkspace/xcuserdata/westkraemer.xcuserdatad/UserInterfaceState.xcuserstate
(HEAD vs. 5973aa5ba45c9967fe6e9aa0012fd2566fcb5467) Auto-merging
solariOSApp.xcworkspace/xcuserdata/westkraemer.xcuserdatad/UserInterfaceState.xcuserstate
CONFLICT (content): Merge conflict in
solariOSApp.xcworkspace/xcuserdata/westkraemer.xcuserdatad/UserInterfaceState.xcuserstate
Automatic merge failed; fix conflicts and then commit the result.
How can I resolve this issue? I am very confused. Thanks so much in advance S.O. community!
github merge
edited Nov 15 '18 at 19:17
Kzrystof
2,07031324
asked Nov 15 '18 at 17:25
WestopherWestopher
48
add a comment |
I have a master branch. I then created a branch called "apiIntegrationOnUX" so that I could add this integration feature on a branch. Now that this integration feature is complete on this branch, I want to merge it back onto my master branch. The "apiIntegrationOnUX" branch is the most up to date version of the app and contains all the same code as the master branch, with the addition of my new feature. I am having a difficult time successfully merging the two branches. I have checked a few guides and when I get to the end point of many of them, I get this message:
$ git pull origin apiIntegrationOnUX From
https://github.com/Westopher/solariOSApp * branch
apiIntegrationOnUX -> FETCH_HEAD warning: Cannot merge binary files:
solariOSApp.xcworkspace/xcuserdata/westkraemer.xcuserdatad/UserInterfaceState.xcuserstate
(HEAD vs. 5973aa5ba45c9967fe6e9aa0012fd2566fcb5467) Auto-merging
solariOSApp.xcworkspace/xcuserdata/westkraemer.xcuserdatad/UserInterfaceState.xcuserstate
CONFLICT (content): Merge conflict in
solariOSApp.xcworkspace/xcuserdata/westkraemer.xcuserdatad/UserInterfaceState.xcuserstate
Automatic merge failed; fix conflicts and then commit the result.
How can I resolve this issue? I am very confused. Thanks so much in advance S.O. community!
github merge
edited Nov 15 '18 at 19:17
Kzrystof
2,07031324
asked Nov 15 '18 at 17:25
WestopherWestopher
48
add a comment |
I have a master branch. I then created a branch called "apiIntegrationOnUX" so that I could add this integration feature on a branch. Now that this integration feature is complete on this branch, I want to merge it back onto my master branch. The "apiIntegrationOnUX" branch is the most up to date version of the app and contains all the same code as the master branch, with the addition of my new feature. I am having a difficult time successfully merging the two branches. I have checked a few guides and when I get to the end point of many of them, I get this message:
$ git pull origin apiIntegrationOnUX From
https://github.com/Westopher/solariOSApp * branch
apiIntegrationOnUX -> FETCH_HEAD warning: Cannot merge binary files:
solariOSApp.xcworkspace/xcuserdata/westkraemer.xcuserdatad/UserInterfaceState.xcuserstate
(HEAD vs. 5973aa5ba45c9967fe6e9aa0012fd2566fcb5467) Auto-merging
solariOSApp.xcworkspace/xcuserdata/westkraemer.xcuserdatad/UserInterfaceState.xcuserstate
CONFLICT (content): Merge conflict in
solariOSApp.xcworkspace/xcuserdata/westkraemer.xcuserdatad/UserInterfaceState.xcuserstate
Automatic merge failed; fix conflicts and then commit the result.
How can I resolve this issue? I am very confused. Thanks so much in advance S.O. community!
github merge
edited Nov 15 '18 at 19:17
Kzrystof
2,07031324
asked Nov 15 '18 at 17:25
WestopherWestopher
48
I have a master branch. I then created a branch called "apiIntegrationOnUX" so that I could add this integration feature on a branch. Now that this integration feature is complete on this branch, I want to merge it back onto my master branch. The "apiIntegrationOnUX" branch is the most up to date version of the app and contains all the same code as the master branch, with the addition of my new feature. I am having a difficult time successfully merging the two branches. I have checked a few guides and when I get to the end point of many of them, I get this message:
$ git pull origin apiIntegrationOnUX From
https://github.com/Westopher/solariOSApp * branch
apiIntegrationOnUX -> FETCH_HEAD warning: Cannot merge binary files:
solariOSApp.xcworkspace/xcuserdata/westkraemer.xcuserdatad/UserInterfaceState.xcuserstate
(HEAD vs. 5973aa5ba45c9967fe6e9aa0012fd2566fcb5467) Auto-merging
solariOSApp.xcworkspace/xcuserdata/westkraemer.xcuserdatad/UserInterfaceState.xcuserstate
CONFLICT (content): Merge conflict in
solariOSApp.xcworkspace/xcuserdata/westkraemer.xcuserdatad/UserInterfaceState.xcuserstate
Automatic merge failed; fix conflicts and then commit the result.
How can I resolve this issue? I am very confused. Thanks so much in advance S.O. community!
github merge
github merge
edited Nov 15 '18 at 19:17
Kzrystof
2,07031324
asked Nov 15 '18 at 17:25
WestopherWestopher
48
edited Nov 15 '18 at 19:17
Kzrystof
2,07031324
asked Nov 15 '18 at 17:25
WestopherWestopher
48
edited Nov 15 '18 at 19:17
Kzrystof
2,07031324
edited Nov 15 '18 at 19:17
Kzrystof
2,07031324
edited Nov 15 '18 at 19:17
Kzrystof
2,07031324
2,07031324
asked Nov 15 '18 at 17:25
WestopherWestopher
48
asked Nov 15 '18 at 17:25
WestopherWestopher
48
asked Nov 15 '18 at 17:25
WestopherWestopher
48
48
add a comment |
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
);
);
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%2f53324893%2fi-want-to-merge-my-branch-apiintegrationonux-onto-the-master-branch-how-can-i%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
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.
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%2f53324893%2fi-want-to-merge-my-branch-apiintegrationonux-onto-the-master-branch-how-can-i%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
