![]() ![]() Using git reset -hard 12eb50c (the new id) let me recover the latest changes without merge tags, great!īut now, after git rebase origin/master (that messes the files again, but now I had time to backup the files, in a non test case situation.), I get this message from git gui:Īfter I accept it, the push from within git gui stopped working, but command line git push gives me this message: To master -> master (non-fast-forward)Įrror: failed to push some refs to Updates were rejected because a pushed branch tip is behind its remote So, how to make the latest (d8f3505 or fdc9ae1 or another new one as soon I recover the backup again), be the one that will win/overwrite the HEAD? This command git reset -hard restores the changes at 772a6c0, therefore I lose the latest ones (I still have the backup). This command keeps the merge tags, therefore uncompilable: git reset origin/master So, my latest changes are at d8f3505 or fdc9ae1 (I recovered backups to retry, thats why such number changed). Or * fdc9ae1 (HEAD, master) improving savable helper | * 772a6c0 (origin/master, origin/HEAD) improving savable helper I am the only one committing files, so this is a git gui versus GitHub bug or limitation for sure.Ģ) do ammend last commit (it may or not cause problem)ģ) do git pull (it may create merge tags messing the files, uncompilable, requiring needles conflict resolve)įrom answer git log -graph -oneline -decorate -all, the fork seems very clear: * d8f3505 (HEAD, master) improving savable helper but I guess there is some straight forward way to overwrite the files modified to allow manual merging with my latest proper changes. So I could painfully get my previous commit in some way (using some git command line). So now, my source files are messed (requiring merge, with that merge tags all over preventing compilation), and there are like 20 files messed. GitHub will not allow me to push the ammended commit, it wants me to merge things unnecessarily (because the ammend commit should work, and simply does not). When I remember that this interaction ( git gui vs GitHub) will mess things up, I copy the comment at "ammend last commit" option, and select "new commit" back again, and paste the comment on it.īut right now I forgot and I am on such mess again. When I go to commit and push using git gui, some times I select "amend last commit" just to reuse the commit message at git gui. Many times, instead of promptly pushing, I just code more. In contrast using emoji is optional if there is room.The problem is on git gui VERSUS github (when I try to push an ammended commit created with git gui). Mainly because its use is required otherwise it looses its perceived value. Maybe there is a perceived benefit but I haven't experienced one yet.Ĭonsidering it takes up valuable characters to the 50 I wish my subject lines to fit within and the fact that I have experienced subject lines that could not be realistically smaller then 45 - 50 characters without losing valuable context I personally avoid extra cruft like adding a type. Suggesting that it does not provide an actual benefit to its placement in the subject line. It isn't till I expand the commit messages and look at the -stat or body of the commit message do I gain any insight to the meaning of the type. I have found that they become meaningless shown on their own in the -online logs. ![]() are contextual and require more information to grok them. However in my experience the distinctions between feat, fix, etc. I am guessing it it for some kind of overview. In all my searching no one has explained the type reasoning. ![]() # - Can use multiple lines with "-" for bullet points in body # - Use the body to explain what and why vs. # - Separate subject from body with a blank line # - Do not end the subject line with a period # - Use the imperative mood in the subject line # chore (updating grunt tasks etc no production code change) # test (adding or refactoring tests no production code change) # style (formatting, missing semi colons, etc no code change) # Provide links or keys to any relevant tickets, articles or other resources # : (If applied, this commit will.) (Max 50 char) ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |