How to pull untracked files with git
The title may not be clear but my issue is, I have a laravel project on gitlab. I cloned the project from the master branch then after running composer install I realized that the bootstrap/autoload.php file was missing.
But on the develop branch it is there. I merged the develop branch into master but it is not getting the bootstrap/autoload.php file. I noticed that the last commit on that file was a year ago, so it has been missing for a while, I just didn't notice.
I also noticed that there were other files on the develop branch that were not getting merged into master.
I checked all my .gitignore files to see if the corresponding files were added but that's not the case because they wouldn't be on gitlab on the develop branch in the first place.
When I run git status on master it says It is up to date. How do I get those missing files merged into master.
git gitlab
asked Jan 19 at 21:05
chinloyalchinloyal
531224
add a comment |
The title may not be clear but my issue is, I have a laravel project on gitlab. I cloned the project from the master branch then after running composer install I realized that the bootstrap/autoload.php file was missing.
But on the develop branch it is there. I merged the develop branch into master but it is not getting the bootstrap/autoload.php file. I noticed that the last commit on that file was a year ago, so it has been missing for a while, I just didn't notice.
I also noticed that there were other files on the develop branch that were not getting merged into master.
I checked all my .gitignore files to see if the corresponding files were added but that's not the case because they wouldn't be on gitlab on the develop branch in the first place.
When I run git status on master it says It is up to date. How do I get those missing files merged into master.
git gitlab
asked Jan 19 at 21:05
chinloyalchinloyal
531224
Have the files ever been in the master branch? If you diff both branches what does it say?
– Dor Shinar
Jan 19 at 21:10
@DorShinar When I rungit diff master..developI getfatal: ambiguous argument 'master..develop': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git <command> [<revision>...] -- [<file>...]'
– chinloyal
Jan 19 at 21:17
Try runninggit diff develop...masterand make sure you fetched both beforehand
– Dor Shinar
Jan 19 at 21:21
@DorShinar I didgit fetch origin developthengit diff develop...masterand still got the same error
– chinloyal
Jan 19 at 21:24
@DorShinar I triedgit diff development...master --but gotfatal: bad revision 'development...master'
– chinloyal
Jan 19 at 21:27
add a comment |
The title may not be clear but my issue is, I have a laravel project on gitlab. I cloned the project from the master branch then after running composer install I realized that the bootstrap/autoload.php file was missing.
But on the develop branch it is there. I merged the develop branch into master but it is not getting the bootstrap/autoload.php file. I noticed that the last commit on that file was a year ago, so it has been missing for a while, I just didn't notice.
I also noticed that there were other files on the develop branch that were not getting merged into master.
I checked all my .gitignore files to see if the corresponding files were added but that's not the case because they wouldn't be on gitlab on the develop branch in the first place.
When I run git status on master it says It is up to date. How do I get those missing files merged into master.
git gitlab
asked Jan 19 at 21:05
chinloyalchinloyal
531224
The title may not be clear but my issue is, I have a laravel project on gitlab. I cloned the project from the master branch then after running composer install I realized that the bootstrap/autoload.php file was missing.
But on the develop branch it is there. I merged the develop branch into master but it is not getting the bootstrap/autoload.php file. I noticed that the last commit on that file was a year ago, so it has been missing for a while, I just didn't notice.
I also noticed that there were other files on the develop branch that were not getting merged into master.
I checked all my .gitignore files to see if the corresponding files were added but that's not the case because they wouldn't be on gitlab on the develop branch in the first place.
When I run git status on master it says It is up to date. How do I get those missing files merged into master.
git gitlab
git gitlab
asked Jan 19 at 21:05
chinloyalchinloyal
531224
asked Jan 19 at 21:05
chinloyalchinloyal
531224
asked Jan 19 at 21:05
chinloyalchinloyal
531224
asked Jan 19 at 21:05
chinloyalchinloyal
531224
asked Jan 19 at 21:05
chinloyalchinloyal
531224
531224
Have the files ever been in the master branch? If you diff both branches what does it say?
– Dor Shinar
Jan 19 at 21:10
@DorShinar When I rungit diff master..developI getfatal: ambiguous argument 'master..develop': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git <command> [<revision>...] -- [<file>...]'
– chinloyal
Jan 19 at 21:17
Try runninggit diff develop...masterand make sure you fetched both beforehand
– Dor Shinar
Jan 19 at 21:21
@DorShinar I didgit fetch origin developthengit diff develop...masterand still got the same error
– chinloyal
Jan 19 at 21:24
@DorShinar I triedgit diff development...master --but gotfatal: bad revision 'development...master'
– chinloyal
Jan 19 at 21:27
add a comment |
Have the files ever been in the master branch? If you diff both branches what does it say?
– Dor Shinar
Jan 19 at 21:10
@DorShinar When I rungit diff master..developI getfatal: ambiguous argument 'master..develop': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git <command> [<revision>...] -- [<file>...]'
– chinloyal
Jan 19 at 21:17
Try runninggit diff develop...masterand make sure you fetched both beforehand
– Dor Shinar
Jan 19 at 21:21
@DorShinar I didgit fetch origin developthengit diff develop...masterand still got the same error
– chinloyal
Jan 19 at 21:24
@DorShinar I triedgit diff development...master --but gotfatal: bad revision 'development...master'
– chinloyal
Jan 19 at 21:27
Have the files ever been in the master branch? If you diff both branches what does it say?
– Dor Shinar
Jan 19 at 21:10
Have the files ever been in the master branch? If you diff both branches what does it say?
– Dor Shinar
Jan 19 at 21:10
@DorShinar When I run
git diff master..develop I get fatal: ambiguous argument 'master..develop': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git <command> [<revision>...] -- [<file>...]'– chinloyal
Jan 19 at 21:17
@DorShinar When I run
git diff master..develop I get fatal: ambiguous argument 'master..develop': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git <command> [<revision>...] -- [<file>...]'– chinloyal
Jan 19 at 21:17
Try running
git diff develop...master and make sure you fetched both beforehand– Dor Shinar
Jan 19 at 21:21
Try running
git diff develop...master and make sure you fetched both beforehand– Dor Shinar
Jan 19 at 21:21
@DorShinar I did
git fetch origin develop then git diff develop...master and still got the same error– chinloyal
Jan 19 at 21:24
@DorShinar I did
git fetch origin develop then git diff develop...master and still got the same error– chinloyal
Jan 19 at 21:24
@DorShinar I tried
git diff development...master -- but got fatal: bad revision 'development...master'– chinloyal
Jan 19 at 21:27
@DorShinar I tried
git diff development...master -- but got fatal: bad revision 'development...master'– chinloyal
Jan 19 at 21:27
add a comment |
1 Answer
1
active
oldest
votes
I fixed the issue by checking out all the files from the develop branch to master branch:
git checkout origin/development -- .
This gave me all the files that were missing from master but were in develop
answered Jan 19 at 23:08
chinloyalchinloyal
531224
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%2f54271385%2fhow-to-pull-untracked-files-with-git%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
I fixed the issue by checking out all the files from the develop branch to master branch:
git checkout origin/development -- .
This gave me all the files that were missing from master but were in develop
answered Jan 19 at 23:08
chinloyalchinloyal
531224
add a comment |
I fixed the issue by checking out all the files from the develop branch to master branch:
git checkout origin/development -- .
This gave me all the files that were missing from master but were in develop
answered Jan 19 at 23:08
chinloyalchinloyal
531224
add a comment |
I fixed the issue by checking out all the files from the develop branch to master branch:
git checkout origin/development -- .
This gave me all the files that were missing from master but were in develop
answered Jan 19 at 23:08
chinloyalchinloyal
531224
I fixed the issue by checking out all the files from the develop branch to master branch:
git checkout origin/development -- .
This gave me all the files that were missing from master but were in develop
answered Jan 19 at 23:08
chinloyalchinloyal
531224
answered Jan 19 at 23:08
chinloyalchinloyal
531224
answered Jan 19 at 23:08
chinloyalchinloyal
531224
answered Jan 19 at 23:08
chinloyalchinloyal
531224
531224
add a comment |
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%2f54271385%2fhow-to-pull-untracked-files-with-git%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 the files ever been in the master branch? If you diff both branches what does it say?
– Dor Shinar
Jan 19 at 21:10
@DorShinar When I run
git diff master..developI getfatal: ambiguous argument 'master..develop': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git <command> [<revision>...] -- [<file>...]'– chinloyal
Jan 19 at 21:17
Try running
git diff develop...masterand make sure you fetched both beforehand– Dor Shinar
Jan 19 at 21:21
@DorShinar I did
git fetch origin developthengit diff develop...masterand still got the same error– chinloyal
Jan 19 at 21:24
@DorShinar I tried
git diff development...master --but gotfatal: bad revision 'development...master'– chinloyal
Jan 19 at 21:27