Cannot checkout/merge files that have been ignored

Multi tool use
Multi tool use


Cannot checkout/merge files that have been ignored



We have had this line in the .gitignore: plugins/third-party/. But the extension was buggy and we needed to add it to the repo later in the process. So we removed that line added everything and pushed it within the dev branch.


.gitignore


plugins/third-party/


dev



Right now I am on a feature branch and doing a $ git pull origin dev or $ git merge origin dev just doesn't checkout the newly added files. Checking out the dev branch shows that they are there and in the repo.


$ git pull origin dev


$ git merge origin dev



I guess that is because the files have been ignored in the past, but what can I do to come around that?





Well was this feature branch created before you made the changes to .gitignore?
– Tim Biegeleisen
Jul 3 at 8:00


.gitignore





YES, that's the case…
– philipp
Jul 3 at 8:05





If you really added the files then I don't see how they could not be there in the dev branch. As for other branches, merge operations, etc., this might be another story.
– Tim Biegeleisen
Jul 3 at 8:07


dev





To make that clear: The files are in the dev branch, but I cannot pull/merge them in the feature branch.
– philipp
Jul 3 at 8:25





After the merge, what does .gitignore look like? Does it reflect your having re-added the files?
– Tim Biegeleisen
Jul 3 at 8:27


.gitignore




1 Answer
1



There's a couple of things you can try:


third-party


.gitignore


pull


merge


rebase


git rebase dev


third-party


cherry-pick


git cherry-pick c20299d09e9


c20299d09e9



I hope one of those options work for you.





The first option is a good suggestion; not sure if 2 or 3 would do much.
– Tim Biegeleisen
Jul 3 at 8:28






By clicking "Post Your Answer", you acknowledge that you have read our updated terms of service, privacy policy and cookie policy, and that your continued use of the website is subject to these policies.

2 Z 5Rv6F5wCYa,euxhsb12sv,dkn sZG,Ig 5tzXEXPTBpx961 CjWd,Uply,0JOcKdiz5qKPTS,Wlg
-
jbhUBbm9AT90SvhT3z,p9JePeJPrEBpkbGC3CzmVRS,Ix11LS,TnPRkfGcIL,1pBKIijS7 JNOiND1gtE3ROQG

Popular posts from this blog

PHP contact form sending but not receiving emails

PHP contact form sending but not receiving emails I have created a contact form using PHP to send the data. The form seems to send fine as there are no errors and success message appears, however I am not receving the emails into the designated inbox. I am using PHPMailer as I originally tried just using the php 'mail' command which I now understand is a bit hit and miss. I cannot see why I would not be receving the emails so I would be very grateful for any help that could be given. I'm quite new to PHP so please be patient with me :) <?php use PHPMailerPHPMailerPHPMailer; use PHPMailerPHPMailerException; $msg = ""; if (isset($_POST['submit'])) { require 'phpmailer/src/Exception.php'; require 'phpmailer/src/PHPMailer.php'; require 'phpmailer/src/SMTP.php'; function sendemail ($to, $from, $body) { $mail = new PHPMailer(true); $mail->setFrom($from); $mail->addAddress($to); $ma...
Read more

Do graphics cards have individual ID by which single devices can be distinguished?

Do graphics cards have individual ID by which single devices can be distinguished? I have several graphics cards of the same manufacturer and same model and I want to distinguish them not only by the pcie socket they reside in but by some individual value I can read from the hardware. Is there such value and if so what would it be called and how could I access it? Right now I'm using modern nvidia cards (10xx series) and nvidia inspector.but I'd prefer if there was any value that was also applicable to amd. I have programming and scripting knowledge. I am running Windows 10 1 Answer 1 This is a powershell example to pull information from video cards. The DeviceID is supposed to be unique but only if the manufacturer supports Windows Display Driver Model (WDDM). (I copied this directly from docs.microsoft.com) $strComputer = "." $colItems = get-wmiobject -class "Win32_VideoC...
Read more

Create weekly swift ios local notifications

Create weekly swift ios local notifications I can create daily notifications but not weekly ones using swift 3 ios 10 User Notifications framework. Daily works fine but when I add in the .weekday parameter it doesn't send me a notification. The code is: for i in 1 ... 7 { let center = UNUserNotificationCenter.current(); let content = UNMutableNotificationContent(); content.title = "Title"; content.body = "content"; content.sound = UNNotificationSound.default(); var dateComponents = DateComponents(); dateComponents.weekday = i; // hours is 00 to 11 in string format if (daynight == "am") { dateComponents.hour = Int(hours); } else { dateComponents.hour = Int(hours)! + 12; } // mins is 00 to 59 in string format dateCom...
Read more