Git ignore local file changes -

-

मैंने दोनों कोशिश की है 

  git update-index --assume-unchanged config / Myconfig

और

संपादन .git / info / exclude और config / myconfig

जोड़ रहा है

लेकिन जब मैं जीआईटी खींचता हूं तो मुझे हमेशा मिलता है:

0156abc..1cfd6a5 त्रुटि को अपडेट करना: निम्न फ़ाइलों में आपके स्थानीय परिवर्तन मर्ज द्वारा अधिलेखित होंगे: config / myconfig कृपया, अपने इससे पहले कि आप विलय कर सकें, उन्हें बदल दें या उन्हें छिपाने दें। Aborting

मुझे क्या याद आ रहा है?

जीआईटी खींचें चाहता है कि आप या तो अपने वर्तमान कार्य को निकालें या सहेज लें, जिससे मर्ज हो सके, आपके अव्यवस्थित कार्य के साथ टकराव का कारण न हो। ध्यान दें कि आपको केवल उन्हीं फ़ाइलों को निकालने / सहेजने की आवश्यकता होनी चाहिए, यदि आप अपने स्थानीय असम्बद्ध फाइलों के रूप में उसी स्थान पर फाइल बनाते हैं, तो उन बदलावों को हटा दें।

अपने अव्यवस्थित परिवर्तनों को निकालें

ट्रैक किए गए फाइलें 

  git checkout -f

अनट्रैक की गई फ़ाइलें 

  git clean -fd

बाद में

ट्रांस्ड फाइल 

  git stash

ट्रैक की गई फ़ाइलें और अनट्रेक्टेड फाइलें

< git stash -u

git pull : 

  git छिपाने की जगह पॉप  के बाद अपने नवीनतम छिपाने की जगह फिर से करें

Comments

Post a Comment

Popular posts from this blog

java - org.apache.http.ProtocolException: Target host is not specified -

-
I have written a simple httprequest / response code and I am getting this error below: I used to type in my classpath httpclient, httpcore, common -Codecs and general logging. I am very new to Java and I do not know what's going on here. Please help me. code: import org.apache.http.client.HttpClient; Import org.apache.http.client.methods.HttpGet; Import org.apache.http.HttpResponse; Import org.apache.http.impl.client.HttpClientBuilder; Import org.apache.http.Header; Import org.apache.http.HttpHeaders; Public class UnshorteningUrl {public static zero main (string [] args throws exception {HttpGet request = zero; HTTP Client Client = HTTP ClientBuilder.credit (). Build (); Try {Request = New HTTP Gate ("trib.me/1lBFzSi"); HttpResponse httpResponse = client.execute (request); Header [] header = httpResponse.getHeaders (HttpHeaders.LOCATION); // Preconditions.checkState (headers.length == 1); String new url = header [0] .getValue (); System.out.println ("new url...
Read more

java - Gradle dependencies: compile project by relative path -

-
Is it possible to specify a dependency on another gradeal project in the granular (in android studios) outside the current project limits? For example, with a relative path like this: dependence {collection project ('../../ stdlib / dagger'}} MyApp (path / user / foo / workspace / mypad) The app (Path / User / Foo / Workspace / MyPass / App) And I have an Android Library Project with 3 subdomules: stdlib (path is / user / foo / Utilities (Path / User / Foo / Workspace / Stadlib / Utilis) http (Path / User / Foo / Workspace / Stadlib / HT) / Li> What I have to do is compile the Dagger, Util, http module in the MyApp project. The Stidelib Library module under heavy development And MyApp will grow in the form of Growth, so I do not want to push them into a Mewen repository. I am a little change. is likely to add another Gredle projects in some way? I will push the study library into the Maven repository after the source is in search of a temp...
Read more

ruby on rails - Object doesn't support #inspect when used with .include -

-
So I have participated in a glitch error that I do not even know how to debug. I am very new to the railing, so it has kicked my ass well when I use the .includes (school) seen by the student, it gives a blue box error, But when I look at any other model and .includes (school) , the school works just fine. class student & lt; ActiveRecord :: Base has has_many: relationships, foreign_key: "liker_id", dependent :: has_many: matches, foreign_key: "student_1_id", dependent :: deleted belong_to: school belong_to: conference belong_to: would_you_rather belong_to: home city belong_to: year is_to: Major and class school & lt; on the console activatecord :: Affiliate for the base: conference includes: respondent, class: "school", foreign_key: "rival_id" (e.g. For: School) Select SQL generated Select "School". * "School" from "school" "ID" IN (1) error message back NoMethodError: u...
Read more