[Git] Can someone help me understand what this git error is saying?

Posted by ProgrammingQuestio@reddit | learnprogramming | View on Reddit | 4 comments

[https://imgur.com/a/oiho3Og](https://imgur.com/a/oiho3Og)  This is a simple repo I made to try to recreate the issue to better understand what's happening.  The process is pretty much:  Make a new branch off of main, called myBranch. Make some commits, push those commits to the remote myBranch.  Then fetch new changes that have since been pushed into main (i.e. after myBranch was created), and rebase myBranch onto the top of main. Make some new changes to myBranch, and try to push to the remote myBranch.  This is when the above error shows up. I'm not able to fully grasp what's going on here and would appreciate it if someone could help me make sense of the error I'm seeing. The way I've gotten around this in the past is to just make a new remote branch called like myBranch2, but this gets confusing and messy and I'd much prefer to continue using the same remote branch

4 Comments

[-]

Rcomian@reddit

ah right, once you've done a rebase you can't do a normal push. git is trying to protect you from potentially losing someone else's work (or your own). but in this case, you do want to overwrite the old branch because of the rebase. it's important to note that what it's telling you to do is WRONG. if you do a pull as it suggests, it will merge your old branch into your rebased branch and you'll have your changes twice. I've had to unpick multiple repositories where this had happened dozens of times because the people followed the advice that was given in the message. what you want to do is first, ensure there are no changes that you're going to lose from the old branch, and then do a push "force with lease". this ensures that if someone pushes to your old branch while you were messing around and you hadn't got their changes on your local, then you'll get an error, can do a fetch and maybe another rebase or cherry pick to get their changes. but yes, in general the sequence is: pull target branch, switch to rebase branch, rebase, push force with lease to safely overwrite the branch on the remote.

ProgrammingQuestio@reddit (OP)

Thank you for the help! I appreciate it :)

AutoModerator@reddit

It seems you may have included a screenshot of code in your post "[[Git] Can someone help me understand what this git error is saying?](https://www.reddit.com/r/learnprogramming/comments/1auzjfr/git_can_someone_help_me_understand_what_this_git/)". If so, note that posting screenshots of code is against /r/learnprogramming's [**Posting Guidelines**](https://www.reddit.com/r/learnprogramming/wiki/index) (section **Formatting Code**): please **edit** your post to use one of the [approved ways of formatting code](https://www.reddit.com/r/learnprogramming/wiki/index#wiki_formatting_code). (Do NOT repost your question! Just edit it.) If your image is not actually a screenshot of code, feel free to ignore this message. Automoderator cannot distinguish between code screenshots and other images. Please, *do not contact the moderators* about this message. Your post is still visible to everyone. *I am a bot, and this action was performed automatically. Please [contact the moderators of this subreddit](/message/compose/?to=/r/learnprogramming) if you have any questions or concerns.*

On July 1st, a [change to Reddit's API pricing](https://www.reddit.com/r/reddit/comments/12qwagm/an_update_regarding_reddits_api/) will come into effect. [Several developers](https://www.reddit.com/r/redditisfun/comments/144gmfq/rif_will_shut_down_on_june_30_2023_in_response_to/) of commercial third-party apps have announced that this change will compel them to shut down their apps. At least [one accessibility-focused non-commercial third party app](https://www.reddit.com/r/DystopiaForReddit/comments/145e9sk/update_dystopia_will_continue_operating_for_free/) will continue to be available free of charge. If you want to express your strong disagreement with the API pricing change or with Reddit's response to the backlash, you may want to consider the following options: 1. Limiting your involvement with Reddit, or 2. Temporarily refraining from using Reddit 3. Cancelling your subscription of Reddit Premium as a way to voice your protest. *I am a bot, and this action was performed automatically. Please [contact the moderators of this subreddit](/message/compose/?to=/r/learnprogramming) if you have any questions or concerns.*

Reply to Post

4 Comments