Xcode project files in version control
Trying to pull latest I received following message:
Igors-MacBook-Air:dbhandler igorkorot$ git pull
warning: redirecting to https://github.com/oneeyeman1/dbhandler.git/
warning: Cannot merge binary files: dbhandler.xcodeproj/project.xcworkspace/xcuserdata/igorkorot.xcuserdatad/UserInterfaceState.xcuserstate (HEAD vs. 99e3237b1e5ece37e624a4ca1c78d739c97e79df)
Auto-merging dbhandler.xcodeproj/project.xcworkspace/xcuserdata/igorkorot.xcuserdatad/UserInterfaceState.xcuserstate
CONFLICT (content): Merge conflict in dbhandler.xcodeproj/project.xcworkspace/xcuserdata/igorkorot.xcuserdatad/UserInterfaceState.xcuserstate
Automatic merge failed; fix conflicts and then commit the result.
Is this file needs to be in VC? My initial thought was to put everything in VC but turns out Xcode project files contains binary files as well. And I'm not well versed with Xcode internals.
xcode git
asked Nov 16 '18 at 4:42
IgorIgor
1,82662857
add a comment |
Trying to pull latest I received following message:
Igors-MacBook-Air:dbhandler igorkorot$ git pull
warning: redirecting to https://github.com/oneeyeman1/dbhandler.git/
warning: Cannot merge binary files: dbhandler.xcodeproj/project.xcworkspace/xcuserdata/igorkorot.xcuserdatad/UserInterfaceState.xcuserstate (HEAD vs. 99e3237b1e5ece37e624a4ca1c78d739c97e79df)
Auto-merging dbhandler.xcodeproj/project.xcworkspace/xcuserdata/igorkorot.xcuserdatad/UserInterfaceState.xcuserstate
CONFLICT (content): Merge conflict in dbhandler.xcodeproj/project.xcworkspace/xcuserdata/igorkorot.xcuserdatad/UserInterfaceState.xcuserstate
Automatic merge failed; fix conflicts and then commit the result.
Is this file needs to be in VC? My initial thought was to put everything in VC but turns out Xcode project files contains binary files as well. And I'm not well versed with Xcode internals.
xcode git
asked Nov 16 '18 at 4:42
IgorIgor
1,82662857
add a comment |
Trying to pull latest I received following message:
Igors-MacBook-Air:dbhandler igorkorot$ git pull
warning: redirecting to https://github.com/oneeyeman1/dbhandler.git/
warning: Cannot merge binary files: dbhandler.xcodeproj/project.xcworkspace/xcuserdata/igorkorot.xcuserdatad/UserInterfaceState.xcuserstate (HEAD vs. 99e3237b1e5ece37e624a4ca1c78d739c97e79df)
Auto-merging dbhandler.xcodeproj/project.xcworkspace/xcuserdata/igorkorot.xcuserdatad/UserInterfaceState.xcuserstate
CONFLICT (content): Merge conflict in dbhandler.xcodeproj/project.xcworkspace/xcuserdata/igorkorot.xcuserdatad/UserInterfaceState.xcuserstate
Automatic merge failed; fix conflicts and then commit the result.
Is this file needs to be in VC? My initial thought was to put everything in VC but turns out Xcode project files contains binary files as well. And I'm not well versed with Xcode internals.
xcode git
asked Nov 16 '18 at 4:42
IgorIgor
1,82662857
Trying to pull latest I received following message:
Igors-MacBook-Air:dbhandler igorkorot$ git pull
warning: redirecting to https://github.com/oneeyeman1/dbhandler.git/
warning: Cannot merge binary files: dbhandler.xcodeproj/project.xcworkspace/xcuserdata/igorkorot.xcuserdatad/UserInterfaceState.xcuserstate (HEAD vs. 99e3237b1e5ece37e624a4ca1c78d739c97e79df)
Auto-merging dbhandler.xcodeproj/project.xcworkspace/xcuserdata/igorkorot.xcuserdatad/UserInterfaceState.xcuserstate
CONFLICT (content): Merge conflict in dbhandler.xcodeproj/project.xcworkspace/xcuserdata/igorkorot.xcuserdatad/UserInterfaceState.xcuserstate
Automatic merge failed; fix conflicts and then commit the result.
Is this file needs to be in VC? My initial thought was to put everything in VC but turns out Xcode project files contains binary files as well. And I'm not well versed with Xcode internals.
xcode git
xcode git
asked Nov 16 '18 at 4:42
IgorIgor
1,82662857
asked Nov 16 '18 at 4:42
IgorIgor
1,82662857
asked Nov 16 '18 at 4:42
IgorIgor
1,82662857
asked Nov 16 '18 at 4:42
IgorIgor
1,82662857
asked Nov 16 '18 at 4:42
IgorIgor
1,82662857
1,82662857
add a comment |
add a comment |
1 Answer
1
active
oldest
votes
Check if adding binary merge to a xcuserstate file would help:
echo '*.xcuserstate binary merge' >> .gitattributes
binarywould keep the implied-text(remove crlf) and-diff(no diff),- but
mergewould allow the file to be merged.
See "using macro attributes" for the documentation, and "gitattributes and the binary option" for a practical example.
However, more generally, such files do not need to be in source control (as stated here).
You can see here what they represent.
You can remove them and ignore them (preferably git rm with the --cached option).
answered Nov 16 '18 at 5:41
VonCVonC
851k30127113272
I will try that but the bigger question is whether the file shuold be under the VC or not.
– Igor
Nov 16 '18 at 18:01
@Igor Right! I missed that part of your question. I have updated my answer accordingly.
– VonC
Nov 16 '18 at 19:31
I exclude those files and eve3rything seems to be still working. Thank you.
– Igor
Nov 20 '18 at 15:56
@Igor Great! Well done.
– VonC
Nov 20 '18 at 16:14
add a comment |
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%2f53331562%2fxcode-project-files-in-version-control%23new-answer', 'question_page');
}
);
Post as a guest
Required, but never shown
1 Answer
1
active
oldest
votes
1 Answer
1
active
oldest
votes
active
oldest
votes
active
oldest
votes
Check if adding binary merge to a xcuserstate file would help:
echo '*.xcuserstate binary merge' >> .gitattributes
binarywould keep the implied-text(remove crlf) and-diff(no diff),- but
mergewould allow the file to be merged.
See "using macro attributes" for the documentation, and "gitattributes and the binary option" for a practical example.
However, more generally, such files do not need to be in source control (as stated here).
You can see here what they represent.
You can remove them and ignore them (preferably git rm with the --cached option).
answered Nov 16 '18 at 5:41
VonCVonC
851k30127113272
I will try that but the bigger question is whether the file shuold be under the VC or not.
– Igor
Nov 16 '18 at 18:01
@Igor Right! I missed that part of your question. I have updated my answer accordingly.
– VonC
Nov 16 '18 at 19:31
I exclude those files and eve3rything seems to be still working. Thank you.
– Igor
Nov 20 '18 at 15:56
@Igor Great! Well done.
– VonC
Nov 20 '18 at 16:14
add a comment |
Check if adding binary merge to a xcuserstate file would help:
echo '*.xcuserstate binary merge' >> .gitattributes
binarywould keep the implied-text(remove crlf) and-diff(no diff),- but
mergewould allow the file to be merged.
See "using macro attributes" for the documentation, and "gitattributes and the binary option" for a practical example.
However, more generally, such files do not need to be in source control (as stated here).
You can see here what they represent.
You can remove them and ignore them (preferably git rm with the --cached option).
answered Nov 16 '18 at 5:41
VonCVonC
851k30127113272
I will try that but the bigger question is whether the file shuold be under the VC or not.
– Igor
Nov 16 '18 at 18:01
@Igor Right! I missed that part of your question. I have updated my answer accordingly.
– VonC
Nov 16 '18 at 19:31
I exclude those files and eve3rything seems to be still working. Thank you.
– Igor
Nov 20 '18 at 15:56
@Igor Great! Well done.
– VonC
Nov 20 '18 at 16:14
add a comment |
Check if adding binary merge to a xcuserstate file would help:
echo '*.xcuserstate binary merge' >> .gitattributes
binarywould keep the implied-text(remove crlf) and-diff(no diff),- but
mergewould allow the file to be merged.
See "using macro attributes" for the documentation, and "gitattributes and the binary option" for a practical example.
However, more generally, such files do not need to be in source control (as stated here).
You can see here what they represent.
You can remove them and ignore them (preferably git rm with the --cached option).
answered Nov 16 '18 at 5:41
VonCVonC
851k30127113272
Check if adding binary merge to a xcuserstate file would help:
echo '*.xcuserstate binary merge' >> .gitattributes
binarywould keep the implied-text(remove crlf) and-diff(no diff),- but
mergewould allow the file to be merged.
See "using macro attributes" for the documentation, and "gitattributes and the binary option" for a practical example.
However, more generally, such files do not need to be in source control (as stated here).
You can see here what they represent.
You can remove them and ignore them (preferably git rm with the --cached option).
answered Nov 16 '18 at 5:41
VonCVonC
851k30127113272
edited Nov 16 '18 at 19:30
answered Nov 16 '18 at 5:41
VonCVonC
851k30127113272
answered Nov 16 '18 at 5:41
VonCVonC
851k30127113272
answered Nov 16 '18 at 5:41
VonCVonC
851k30127113272
851k30127113272
I will try that but the bigger question is whether the file shuold be under the VC or not.
– Igor
Nov 16 '18 at 18:01
@Igor Right! I missed that part of your question. I have updated my answer accordingly.
– VonC
Nov 16 '18 at 19:31
I exclude those files and eve3rything seems to be still working. Thank you.
– Igor
Nov 20 '18 at 15:56
@Igor Great! Well done.
– VonC
Nov 20 '18 at 16:14
add a comment |
I will try that but the bigger question is whether the file shuold be under the VC or not.
– Igor
Nov 16 '18 at 18:01
@Igor Right! I missed that part of your question. I have updated my answer accordingly.
– VonC
Nov 16 '18 at 19:31
I exclude those files and eve3rything seems to be still working. Thank you.
– Igor
Nov 20 '18 at 15:56
@Igor Great! Well done.
– VonC
Nov 20 '18 at 16:14
I will try that but the bigger question is whether the file shuold be under the VC or not.
– Igor
Nov 16 '18 at 18:01
I will try that but the bigger question is whether the file shuold be under the VC or not.
– Igor
Nov 16 '18 at 18:01
@Igor Right! I missed that part of your question. I have updated my answer accordingly.
– VonC
Nov 16 '18 at 19:31
@Igor Right! I missed that part of your question. I have updated my answer accordingly.
– VonC
Nov 16 '18 at 19:31
I exclude those files and eve3rything seems to be still working. Thank you.
– Igor
Nov 20 '18 at 15:56
I exclude those files and eve3rything seems to be still working. Thank you.
– Igor
Nov 20 '18 at 15:56
@Igor Great! Well done.
– VonC
Nov 20 '18 at 16:14
@Igor Great! Well done.
– VonC
Nov 20 '18 at 16:14
add a comment |
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%2f53331562%2fxcode-project-files-in-version-control%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
