java - How can I clean merge my new version of code with old one without using `-f` flag? -

-

I have worked on local brakes in my computer; Apart from that, I have a public python. The only writer of the code, as you guessed, is what I want to do when I want to git push origin master , I get merge before pushing the error, That's why I always pull the original master and then add GIT. & Amp; Git commit -m "merged." However, this line of code renders my code useless. In other words, in my code, I , hash code and merge version of old and new code in the same file. Only writer, my gitab account does not recognize my past and always pushed me to merge the old version with the new version in the same file. Besides, add lines of <<>> type in in your code. How do I clean merge , No like things or in the old one with no one in the old, my old version of code (not -f flag without using the flag?

I am using Git Open in Windows.


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

c# - Chart control: Design messed Up after clearing and re-adding Y-Values -

-
Image
The day was struggling with this. I have three series on a chart that looks like this. Note: I am using vanof control. They are being added on the basis of input from the calculation. I am using this code to add value to each series. this.chart1.Series ["green"]. Points. AddY (greenvalue); This.chart1.Series ["totalsaving"] Points.AddY (totalsavingvalue). This.chart1.Series ["blue"] Points.AddY (bluevalue). I have set series properties like this. Both green and totalsaving are set to StackedColumn, the blue chart is set to the column for type. I started then To do is a button that brings the user back to the input field and then I am using this code to clear the series values ​​on the start code. chart 1. Series ["totaling"]. Points. clear (); Chart1.Series ["green"] Points.Clear () .; Chart1.Series ["blue"] Points.Clear () .; The same calculation click above is being calculated for the calculation of th...
Read more

javascript - Bootstrap Modal won't close, previously appended to Body using JQuery -

-
So I go to all the difficulties to get a modal and working text box, then I close it Go to the AJAX success event, but nothing seems to work I'll try. var id; Var refundarm = ''; Var Token = $ ("Meta [name = 'CSRF-Token']"). Attr ('content'); $ ('[Data-Toggle =' Model ']'). Find ID from ('click', function (e) {var checkEventCount = 1; var prevTarget; // Models href attribute ID = $ (this) .attr ('href'). (/ [^ 0-9.] / G, ""); $ ('# new_refund_modal' + id) .on ('show.bs.modal', function (e) {if (prevofarget == 'undefined' || (CzechEventCount == 1 & amp; Amp; e.target! = PrevTarget)) {prevTarget = e.target; CzechEventContent ++; E.Pravant Default (); $ (E.T. ('$'), ('$'), () () () () (Value)) = Refund Amount (Refund amount = $ (this) .val ();}});} And if (e.target == Navigate & amp; amp; Number == 2) {checkeventcount--;}});}); $ ('Refund-deposit-BTN...
Read more