I'm using ij idea .What can I do to avoid the git pull operation failed?
the information it shows is something like
your local files will be override.......
Is something wrong with the gitignore file?
What can I do to eliminate it absolutely? Thanks a lot!
git intellij-idea git-pull
asked Nov 24 '18 at 8:13
marlowexmarlowex
12
|
show 1 more comment
the information it shows is something like
your local files will be override.......
Is something wrong with the gitignore file?
What can I do to eliminate it absolutely? Thanks a lot!
git intellij-idea git-pull
asked Nov 24 '18 at 8:13
marlowexmarlowex
12
Have you committed your local changes before pull?
– Muhammad Azam
Nov 24 '18 at 8:15
1
Commit, stash, or revert the changes you've done locally.
– JB Nizet
Nov 24 '18 at 8:15
I don't committed the files in the .idea dir because I want push it to the remote branch and these files is forbidden to push to the remote branch.
– marlowex
Nov 24 '18 at 8:26
Then use.gitignoreto ignore the future tracking of .idea folder, and usegit filter-branchto remove the history of .idea folder.
– Geno Chen
Nov 24 '18 at 8:42
Possible duplicate of How do I resolve git saying "Commit your changes or stash them before you can merge"?
– phd
Nov 24 '18 at 12:09
|
show 1 more comment
the information it shows is something like
your local files will be override.......
Is something wrong with the gitignore file?
What can I do to eliminate it absolutely? Thanks a lot!
git intellij-idea git-pull
asked Nov 24 '18 at 8:13
marlowexmarlowex
12
the information it shows is something like
your local files will be override.......
Is something wrong with the gitignore file?
What can I do to eliminate it absolutely? Thanks a lot!
git intellij-idea git-pull
git intellij-idea git-pull
asked Nov 24 '18 at 8:13
marlowexmarlowex
12
asked Nov 24 '18 at 8:13
marlowexmarlowex
12
edited Nov 24 '18 at 14:55
marlowex
asked Nov 24 '18 at 8:13
marlowexmarlowex
12
asked Nov 24 '18 at 8:13
marlowexmarlowex
12
asked Nov 24 '18 at 8:13
marlowexmarlowex
12
12
Have you committed your local changes before pull?
– Muhammad Azam
Nov 24 '18 at 8:15
1
Commit, stash, or revert the changes you've done locally.
– JB Nizet
Nov 24 '18 at 8:15
I don't committed the files in the .idea dir because I want push it to the remote branch and these files is forbidden to push to the remote branch.
– marlowex
Nov 24 '18 at 8:26
Then use.gitignoreto ignore the future tracking of .idea folder, and usegit filter-branchto remove the history of .idea folder.
– Geno Chen
Nov 24 '18 at 8:42
Possible duplicate of How do I resolve git saying "Commit your changes or stash them before you can merge"?
– phd
Nov 24 '18 at 12:09
|
show 1 more comment
Have you committed your local changes before pull?
– Muhammad Azam
Nov 24 '18 at 8:15
1
Commit, stash, or revert the changes you've done locally.
– JB Nizet
Nov 24 '18 at 8:15
I don't committed the files in the .idea dir because I want push it to the remote branch and these files is forbidden to push to the remote branch.
– marlowex
Nov 24 '18 at 8:26
Then use.gitignoreto ignore the future tracking of .idea folder, and usegit filter-branchto remove the history of .idea folder.
– Geno Chen
Nov 24 '18 at 8:42
Possible duplicate of How do I resolve git saying "Commit your changes or stash them before you can merge"?
– phd
Nov 24 '18 at 12:09
Have you committed your local changes before pull?
– Muhammad Azam
Nov 24 '18 at 8:15
Have you committed your local changes before pull?
– Muhammad Azam
Nov 24 '18 at 8:15
1
1
Commit, stash, or revert the changes you've done locally.
– JB Nizet
Nov 24 '18 at 8:15
Commit, stash, or revert the changes you've done locally.
– JB Nizet
Nov 24 '18 at 8:15
I don't committed the files in the .idea dir because I want push it to the remote branch and these files is forbidden to push to the remote branch.
– marlowex
Nov 24 '18 at 8:26
I don't committed the files in the .idea dir because I want push it to the remote branch and these files is forbidden to push to the remote branch.
– marlowex
Nov 24 '18 at 8:26
Then use
.gitignore to ignore the future tracking of .idea folder, and use git filter-branch to remove the history of .idea folder.– Geno Chen
Nov 24 '18 at 8:42
Then use
.gitignore to ignore the future tracking of .idea folder, and use git filter-branch to remove the history of .idea folder.– Geno Chen
Nov 24 '18 at 8:42
Possible duplicate of How do I resolve git saying "Commit your changes or stash them before you can merge"?
– phd
Nov 24 '18 at 12:09
Possible duplicate of How do I resolve git saying "Commit your changes or stash them before you can merge"?
– phd
Nov 24 '18 at 12:09
|
show 1 more comment
1 Answer
1
active
oldest
votes
It has nothing to do with the .gitignore it means that you have changes which are not committed while others have been modifying the same file in the remote repository.
Commit your changes and then perform the pull
# add your files to the staging area
git add . (or any other file that you need)
git commit
# now pull
git pull
Or if you dont wish to commit:
git stash
# now pull
git pull
I don't committed the files in the .idea dir because I want to push it to the remote branch and these files is forbidden to push to the remote branch.
- If you did not add those to the gitignore add them
If they are already commited remove them from the index
# remve the commited files
git rm --cached <file list>
Or if you wish to remove them completely from the history use
BFG - https://rtyley.github.io/bfg-repo-cleaner/
Use this ignore file from now on:
https://www.gitignore.io/api/intellij
answered Nov 24 '18 at 8:59
CodeWizardCodeWizard
53.2k127096
Sure, if it helped you,you should accept the answer. Appricated
– CodeWizard
Nov 24 '18 at 10: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%2f53456389%2fim-using-ij-idea-what-can-i-do-to-avoid-the-git-pull-operation-failed%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
It has nothing to do with the .gitignore it means that you have changes which are not committed while others have been modifying the same file in the remote repository.
Commit your changes and then perform the pull
# add your files to the staging area
git add . (or any other file that you need)
git commit
# now pull
git pull
Or if you dont wish to commit:
git stash
# now pull
git pull
I don't committed the files in the .idea dir because I want to push it to the remote branch and these files is forbidden to push to the remote branch.
- If you did not add those to the gitignore add them
If they are already commited remove them from the index
# remve the commited files
git rm --cached <file list>
Or if you wish to remove them completely from the history use
BFG - https://rtyley.github.io/bfg-repo-cleaner/
Use this ignore file from now on:
https://www.gitignore.io/api/intellij
answered Nov 24 '18 at 8:59
CodeWizardCodeWizard
53.2k127096
Sure, if it helped you,you should accept the answer. Appricated
– CodeWizard
Nov 24 '18 at 10:14
add a comment |
It has nothing to do with the .gitignore it means that you have changes which are not committed while others have been modifying the same file in the remote repository.
Commit your changes and then perform the pull
# add your files to the staging area
git add . (or any other file that you need)
git commit
# now pull
git pull
Or if you dont wish to commit:
git stash
# now pull
git pull
I don't committed the files in the .idea dir because I want to push it to the remote branch and these files is forbidden to push to the remote branch.
- If you did not add those to the gitignore add them
If they are already commited remove them from the index
# remve the commited files
git rm --cached <file list>
Or if you wish to remove them completely from the history use
BFG - https://rtyley.github.io/bfg-repo-cleaner/
Use this ignore file from now on:
https://www.gitignore.io/api/intellij
answered Nov 24 '18 at 8:59
CodeWizardCodeWizard
53.2k127096
Sure, if it helped you,you should accept the answer. Appricated
– CodeWizard
Nov 24 '18 at 10:14
add a comment |
It has nothing to do with the .gitignore it means that you have changes which are not committed while others have been modifying the same file in the remote repository.
Commit your changes and then perform the pull
# add your files to the staging area
git add . (or any other file that you need)
git commit
# now pull
git pull
Or if you dont wish to commit:
git stash
# now pull
git pull
I don't committed the files in the .idea dir because I want to push it to the remote branch and these files is forbidden to push to the remote branch.
- If you did not add those to the gitignore add them
If they are already commited remove them from the index
# remve the commited files
git rm --cached <file list>
Or if you wish to remove them completely from the history use
BFG - https://rtyley.github.io/bfg-repo-cleaner/
Use this ignore file from now on:
https://www.gitignore.io/api/intellij
answered Nov 24 '18 at 8:59
CodeWizardCodeWizard
53.2k127096
It has nothing to do with the .gitignore it means that you have changes which are not committed while others have been modifying the same file in the remote repository.
Commit your changes and then perform the pull
# add your files to the staging area
git add . (or any other file that you need)
git commit
# now pull
git pull
Or if you dont wish to commit:
git stash
# now pull
git pull
I don't committed the files in the .idea dir because I want to push it to the remote branch and these files is forbidden to push to the remote branch.
- If you did not add those to the gitignore add them
If they are already commited remove them from the index
# remve the commited files
git rm --cached <file list>
Or if you wish to remove them completely from the history use
BFG - https://rtyley.github.io/bfg-repo-cleaner/
Use this ignore file from now on:
https://www.gitignore.io/api/intellij
answered Nov 24 '18 at 8:59
CodeWizardCodeWizard
53.2k127096
answered Nov 24 '18 at 8:59
CodeWizardCodeWizard
53.2k127096
answered Nov 24 '18 at 8:59
CodeWizardCodeWizard
53.2k127096
answered Nov 24 '18 at 8:59
CodeWizardCodeWizard
53.2k127096
53.2k127096
Sure, if it helped you,you should accept the answer. Appricated
– CodeWizard
Nov 24 '18 at 10:14
add a comment |
Sure, if it helped you,you should accept the answer. Appricated
– CodeWizard
Nov 24 '18 at 10:14
Sure, if it helped you,you should accept the answer. Appricated
– CodeWizard
Nov 24 '18 at 10:14
Sure, if it helped you,you should accept the answer. Appricated
– CodeWizard
Nov 24 '18 at 10: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%2f53456389%2fim-using-ij-idea-what-can-i-do-to-avoid-the-git-pull-operation-failed%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
Have you committed your local changes before pull?
– Muhammad Azam
Nov 24 '18 at 8:15
1
Commit, stash, or revert the changes you've done locally.
– JB Nizet
Nov 24 '18 at 8:15
I don't committed the files in the .idea dir because I want push it to the remote branch and these files is forbidden to push to the remote branch.
– marlowex
Nov 24 '18 at 8:26
Then use
.gitignoreto ignore the future tracking of .idea folder, and usegit filter-branchto remove the history of .idea folder.– Geno Chen
Nov 24 '18 at 8:42
Possible duplicate of How do I resolve git saying "Commit your changes or stash them before you can merge"?
– phd
Nov 24 '18 at 12:09