github - did a git commit, git pull and pushed my changes to the repo. How can i send a Pull request for the one that i committed -

-

I was searching this entire web, but the solution could not be found. This is my scenario,

1) I made my local changes. A git was committed, it calls a committed ID ABC

2) Now I pulled a git from my upstream. It was a merging conflict and after solving it, she made a commitment to it. <3> Now I push them to my original place. From the original, I have to send a bridge request for upstream.

4) While trying to send a bridge request, I see that both of them earn.

How I have only committed that I have done, which is to reduce ABC (from step # 1)

The bridge request is made between branches - you ask the owner of the target repo dragging one of his branches.

If you wish to request a bridge, after joining only one commitment, you will have to get a branch which is different from one in that goal only.

The best thing you can do, I think, git fetch create a branch starting from one of your upstream remotes, and then from one of the branches, Code> upstream / master (but if you are not targeting master in your pull request it can be a separate branch) git checkout -b My-feature upstream / master must be done - these names meet those people you have.

If this works, then you now have a new branch called a My-branch , which will be upstream master Code> indicates the number of the branch. At this moment, you can do git cherry-pick which you want to show in the PR (or you manually edit files and git commit ) As you like, you fulfill your work - and now, as you do this new work in the convenience branch, git push your own branch In repo (e.g., git push my-feature ). This will be the my-feature branch in your original repository (if it was not present, which would be best), and now you can create a bridge request my -feature to master in the branch upstream .

What do you say, the problem seems to make sure that you make GIT bridge your branch - rather than making that code instead of git rebase Use . In this way, git automatically tries to cherry-pick its command at the top of the target branch (e.g., upstream / master ), and no merge is committed.

Nevertheless, it never forgets that git rebase is dangerous , and if you can not understand it completely then it should not be used You want better, and then it will be good to use when and how.

If this is just one thing, never forget the rule of thumb: Never share public commitment.

Comments

Post a Comment

Popular posts from this blog

ios - Adding an SKSpriteNode to SKScene from a child SKSpriteNode -

-
I have a SKScene where I am adding an SKSpriteNode I have subclassed the SKSpriteNode class to create this node. In the subclass I am defining some SKActions on Sprite. What do I want to do when the end of this phantom ends the SKAction sequence, then I add a new Prayer node to this scene. How is this possible. The following code is mine: The code for the sequence is that I'm running on the Scansprinitode subclass (TEMissileNode): - SKAction * moveDown = [SKAction moveToY: Self.position.y - 20 Duration: 0.2]; SKAction * animation = [SKAction animateWithTextures: textures timePerFrame: time / 7]; SKAction * moveMissileProjectile = [SKAction Moving: Pointoffscreen Term: Time]; SKAction * group = [SKAction group: @ [animation, movement projectile]]; SKAction * Sequence = [SKAction Sequence: @ [Hilldown, Group, [SKAction removalFromParent]]]; [Self run action: sequence]; From the main scene, I call those actions that execute these tasks TEMissileNode * missile = [tmissil...
Read more

Matlab transpose a table vector -

-
An embarrassing simple question seems to be, but how can I move a Matlab table vector? aTableT = aTable '; I tried a standard syntax for the simple interaction of a line vector to a line vector aTable : ATableT = reshape (aTable, 1, Height (aTable)); and aTableT = rot90 (aTable); According to the head, the last time table should work for table, see. However, I get this error code: Error type in using table / permit (line 396) Undefined function 'permute' for the input arguments. Error in rot 90 (line 29) b = magnitude (b, [2 1 3: ndims (a)]); NB: fliplr is not useful either pretty sure I have covered clear angles - any ideas? Thanks! Try changing your table into an array, move it, then back to a table In other words, try doing this: aTableArray = table2array (aTable); ATableT = array 2table (aTableArray. '); I have also read the document for rot90 , and it says that rot90 is definitely working for tables Do, and I find you...
Read more

c# - Textbox not clickable but editable -

-
I have a small form with 10 text boxes, I have set them in the correct tab order. I want them on my tab service I was wondering if there is a way to set the text box so that they can be selected for editing until they are tabbed. That is ... I do not want the end user to edit the text box to click on them, I just want to make them editable through tabu. this should do the trick public partial category poor text box: Text Box {Safe Override Zero WndProc (Ref: Message Message) {if (m.msg == (Int) WM.LBUTTONDOWN) {Return; // mount down events} base.WndProc (ref m); }} Window message enum can be found. How to do this without anherizing: text box : class EatMouseDown: netwindows {safe override zero WndProc (ref message message) {if (m.msg == (int) WM.LBUTTONDOWN) {return; } Base.WandProc (Ref M); }} Safe Override Zero Onload (EventEurge E) {base.OnLoad (e); How to do this without any part: left a clean part, whatever is important, this can be a buggy but it works R...
Read more